Commit Graph

73225 Commits

Author SHA1 Message Date
klemens
beb2791dde spelling fixes 2019-02-10 12:59:09 +01:00
Laurent Destailleur
7d20321b3b Fix trans 2019-02-09 19:24:52 +01:00
Laurent Destailleur
0839b39c52 Fix translation 2019-02-09 19:15:36 +01:00
Laurent Destailleur
d38ead798a Trans 2019-02-09 19:12:24 +01:00
Laurent Destailleur
c77d328f12 Fix translation 2019-02-09 19:05:15 +01:00
Laurent Destailleur
522afd8e7b Fix font awesome 5 2019-02-09 13:11:02 +01:00
Laurent Destailleur
5483856543 Fix phpcs 2019-02-08 23:53:40 +01:00
Laurent Destailleur
7625eb7cd4 Fix missing error management after afterPDFCreation hook.
Removed dead code
2019-02-08 19:54:24 +01:00
Laurent Destailleur
e2934a6b5f Error message returned by old non "addreplace" hooks is propagated too 2019-02-08 19:38:52 +01:00
Laurent Destailleur
d6628a87a9 Fix phpcs 2019-02-08 17:48:24 +01:00
Laurent Destailleur
f333fb3b7d Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-02-08 14:59:07 +01:00
Laurent Destailleur
8412a91576 Fix do not send email if approval error 2019-02-08 14:58:46 +01:00
Laurent Destailleur
7f9d995c9c Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/holiday/card.php
2019-02-08 14:54:31 +01:00
Laurent Destailleur
2e1201b7b0 FIX Transaction on leave approval and decrease ko if setup not complete 2019-02-08 14:47:03 +01:00
Laurent Destailleur
ed733fb82d Fix phpcs 2019-02-08 13:28:10 +01:00
Laurent Destailleur
766ef36ea3 Standardize code of page of leave movements 2019-02-08 13:26:59 +01:00
Laurent Destailleur
8760b1e592 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-02-08 12:57:50 +01:00
Laurent Destailleur
27da574e38 Fix phpcs 2019-02-08 12:36:33 +01:00
Laurent Destailleur
a40d4ddbaa Fix phpcs 2019-02-08 12:23:04 +01:00
Laurent Destailleur
1611c613f5 Fix phpcs 2019-02-08 12:19:51 +01:00
Laurent Destailleur
5043aa7b35 Fix regression for icon of external menus 2019-02-08 12:17:11 +01:00
Laurent Destailleur
78fbeeaa62 Fix syntax error 2019-02-08 11:57:39 +01:00
Laurent Destailleur
b3f955e9a5 Fix syntax error 2019-02-08 11:55:27 +01:00
Laurent Destailleur
ec686a8f79 Fix phpcs 2019-02-08 11:30:20 +01:00
Laurent Destailleur
512ceae70a Fix phpcs 2019-02-08 11:27:30 +01:00
Laurent Destailleur
38d4284638 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/db/pgsql.class.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/filefunc.inc.php
	htdocs/imports/import.php
	htdocs/supplier_proposal/card.php
2019-02-08 11:26:08 +01:00
Laurent Destailleur
e81a2548d8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-02-08 11:17:14 +01:00
Laurent Destailleur
14a48b2c95 Fix phpcs 2019-02-08 11:17:04 +01:00
Laurent Destailleur
7cc0607e28
Merge pull request #10528 from laudeco/feature/9429_top_menu_icons
#9429 - use font awesome for the top menu icons
2019-02-08 11:15:34 +01:00
Laurent Destailleur
9b2a91893d Update doc 2019-02-08 10:49:02 +01:00
Laurent Destailleur
662ed9fba7 Prepare 9.0.1 2019-02-08 10:47:25 +01:00
Laurent Destailleur
fe1188c4ea Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
	htdocs/filefunc.inc.php
2019-02-08 10:44:45 +01:00
Laurent Destailleur
3a5fc8f0c3 NEW Add protection to avoid packaging if files non indexed exists into
dir.
2019-02-08 10:41:11 +01:00
Laurent Destailleur
2686062031 Prepare version 9.0.1 2019-02-08 10:30:07 +01:00
Laurent Destailleur
43fbcf7081 Prepare 8.0.5 2019-02-08 10:28:59 +01:00
Laurent Destailleur
1c129a78ae Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-02-08 10:22:55 +01:00
Laurent Destailleur
679a13e48c Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
	htdocs/expedition/class/expedition.class.php
2019-02-08 10:22:36 +01:00
Laurent Destailleur
fbd2d368e4
Update style.css.php 2019-02-08 10:19:59 +01:00
Laurent Destailleur
8143acbadf
Merge branch 'develop' into feature/9429_top_menu_icons 2019-02-08 10:15:09 +01:00
Laurent Destailleur
3318baa664
Merge pull request #10522 from atm-ph/fix_8.0_crabe_payment_table
Fix display payment table on multiple pages
2019-02-08 10:08:46 +01:00
Laurent Destailleur
3d58e93a3c
Merge pull request #10525 from atm-greg/8.0_FIX_supplier_proposal_lines_added_without_unit
FIX add fk_unit on addline action
2019-02-08 10:01:29 +01:00
Laurent Destailleur
aa574c2a47
Merge pull request #10517 from frederic34/patch-18
fix phpcs
2019-02-08 09:56:50 +01:00
Laurent Destailleur
7334f02e5c
Merge pull request #10514 from atm-florian/dev_defautselectcustomertype
Dev defautselectcustomertype
2019-02-08 09:56:29 +01:00
Laurent Destailleur
81507ea43e
Merge pull request #10510 from frederic34/patch-2
fix phpcs public/payment/newpayment.php
2019-02-08 09:53:23 +01:00
Laurent Destailleur
4997b5968f
Merge pull request #10506 from ATM-Marc/FIX_7.0_parent_line
FIX: line edit template: keep fk_parent_line
2019-02-08 09:52:21 +01:00
Laurent Destailleur
714516fc18
Merge pull request #10509 from OPEN-DSI/fix-margin-agents
Fix margin by users when a thirdparty have many sellers
2019-02-08 09:51:26 +01:00
Laurent Destailleur
3f01cd554b
Update agentMargins.php 2019-02-08 09:50:45 +01:00
Laurent Destailleur
76b021d061
Merge pull request #10505 from ATM-Marc/FIX_7.0_expedition_status
FIX: expedition: reset status on rollback
2019-02-08 09:46:14 +01:00
Laurent Destailleur
92ef0d75cf
Merge pull request #10504 from atm-quentin/FIX_supplier_invoice_paiement_credit_deposit
FIX supplier invoice payment total doesnnt care about deposit or credit
2019-02-08 09:44:42 +01:00
Laurent Destailleur
ccda5719cf
Merge pull request #10503 from atm-quentin/FIX_product_stat_supplier_invoice
FIX supplier invoice product stats total ht is line total not invoice…
2019-02-08 09:43:38 +01:00