Commit Graph

1657 Commits

Author SHA1 Message Date
Laurent Destailleur
5d7a1f1265 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/contact/card.php
	htdocs/core/class/extrafields.class.php
	htdocs/langs/en_US/stocks.lang
2019-11-19 19:02:14 +01:00
Frédéric FRANCE
b61a3f1ba9 Update bookkeeping.class.php 2019-11-18 19:59:21 +01:00
Frédéric FRANCE
5c0976a778 doxygen accountancy class 2019-11-16 09:58:14 +01:00
Alexandre SPANGARO
3937b45c5f Core - Fix accountancy write social contribution in bookkeeping (Need for FEC format) 2019-11-16 07:51:38 +01:00
Laurent Destailleur
0e3d90f145 Fix syntax error 2019-11-14 12:42:44 +01:00
Scrutinizer Auto-Fixer
ddcc14dc16 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-14 11:09:15 +00:00
Laurent Destailleur
171b94fc5c Merge pull request #12429 from Dolibarr/scrutinizer-patch-5
Scrutinizer Auto-Fixes
2019-11-14 08:50:24 +01:00
Laurent Destailleur
86094613e8 Merge pull request #12428 from Dolibarr/scrutinizer-patch-4
Scrutinizer Auto-Fixes
2019-11-14 08:50:06 +01:00
Laurent Destailleur
614faa07c1 Merge pull request #12427 from Dolibarr/scrutinizer-patch-3
Scrutinizer Auto-Fixes
2019-11-14 08:49:53 +01:00
Scrutinizer Auto-Fixer
b40ecc3933 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-13 18:37:08 +00:00
Scrutinizer Auto-Fixer
ac40dd8bbe Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-13 18:35:39 +00:00
Scrutinizer Auto-Fixer
8a527631a0 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-13 18:35:02 +00:00
Scrutinizer Auto-Fixer
f4aaa8d9bb Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-13 18:34:37 +00:00
Laurent Destailleur
c02cd80b75 Clean code 2019-11-12 10:11:30 +01:00
Scrutinizer Auto-Fixer
c85e54b08c Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-12 08:46:08 +00:00
Laurent Destailleur
4f7b698e92 Fix filter on sell/purchase status 2019-11-11 19:42:54 +01:00
Laurent Destailleur
2ccef4e469 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
2019-11-11 19:10:35 +01:00
Laurent Destailleur
5ae5b87b60 Fix get bad default value for accounting for sales export 2019-11-11 19:07:22 +01:00
Laurent Destailleur
8976bd7c9b Fix setup of accounting account 2019-11-11 19:05:42 +01:00
Laurent Destailleur
f62f73f5cb FIX Bad value suggested in default product account setup 2019-11-11 19:05:06 +01:00
Laurent Destailleur
40d66489ad Trans 2019-11-11 13:47:17 +01:00
stickler-ci
11f29df93d Fixing style errors. 2019-11-10 09:52:03 +00:00
Philippe GRAND
762b70fab7 add some comment 2019-11-10 10:51:16 +01:00
Laurent Destailleur
9423449237 Merge pull request #12308 from olibre/FIX_the_SELECT_examine_more_than_MAX_JOIN_SIZE_rows_12305
FIX the SELECT examine more than MAX_JOIN_SIZE rows #12305
2019-11-07 11:26:50 +01:00
Laurent Destailleur
cb26567cfe Revert option ACCOUNTANCY_AUTOFILL_ACCOUNT_WITH_GENERIC into
ACCOUNTANCY_DO_NOT_AUTOFILL_ACCOUNT_WITH_GENERIC
2019-11-07 11:17:53 +01:00
Laurent Destailleur
1ea8fed9c4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-11-07 11:16:20 +01:00
Laurent Destailleur
feef992d39 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-11-07 11:16:09 +01:00
Laurent Destailleur
de77e39e08 FIX #12319 Restore feature ACCOUNTANCY_AUTOFILL_ACCOUNT_WITH_GENERIC.
Now autofill works, option can be reverted in v11.
2019-11-07 11:14:36 +01:00
Frédéric FRANCE
35751a80ab 100% centpercent 2019-11-05 21:24:41 +01:00
Laurent Destailleur
ce1dec253f FIX #11364 2019-11-05 12:47:38 +01:00
Laurent Destailleur
d6667675b4 Merge pull request #12336 from grandoc/new_branch_05_11_2019
fix bad setEventMessages
2019-11-05 10:07:07 +01:00
Philippe GRAND
4acc107191 fix bad setEventMessages 2019-11-05 10:01:21 +01:00
O. Libre
441eadb883 Check if mysqli to avoid perturbing PostgreSQL with "SET SQL_BIG_SELECTS=1" 2019-11-05 06:21:35 +01:00
O. Libre
729ed78063 FIX the SELECT examine more than MAX_JOIN_SIZE rows #12305 2019-11-05 06:21:26 +01:00
Frédéric FRANCE
d059df1348 Update thirdparty_lettering_supplier.php 2019-11-04 22:51:15 +01:00
Frédéric FRANCE
5113e5e570 fix missing newtoken 2019-11-04 22:50:19 +01:00
Laurent Destailleur
11500fb8d9 FIX confusion between permto... and permisstionto... 2019-11-04 15:33:49 +01:00
Laurent Destailleur
e087ac434d Merge pull request #12283 from frederic34/socid
replace deprecated user->societe_id by user->socid
2019-11-02 13:34:21 +01:00
Laurent Destailleur
d232b7a387 Merge pull request #12286 from grandoc/new_branch_01_11_2019
add some comment
2019-11-02 13:00:23 +01:00
Laurent Destailleur
45c77b4560 Renaming some libelle into label 2019-11-02 12:59:38 +01:00
Laurent Destailleur
c12e66e2a2 Merge branch 'develop' into new_branch_01_11_2019 2019-11-02 12:00:04 +01:00
Frédéric FRANCE
77d4ca81dc Merge remote-tracking branch 'upstream/develop' into socid 2019-11-02 09:14:15 +01:00
Laurent Destailleur
cea2c3a9f4 Look and feel v11 2019-11-01 23:58:14 +01:00
Philippe Grand
3692a6602d Update bookkeeping.class.php 2019-11-01 11:12:09 +01:00
stickler-ci
a8f7082a3a Fixing style errors. 2019-11-01 09:36:18 +00:00
Philippe GRAND
5bafcae767 add some comment 2019-11-01 10:36:17 +01:00
Frédéric FRANCE
e93aaa2a75 replace deprecated user->societe_id by user->socid 2019-10-31 20:46:31 +01:00
Laurent Destailleur
be3f0471ff Fix phpcs 2019-10-21 11:27:48 +02:00
Laurent Destailleur
febf9ccd04 FIX The Button "Automatic binding" did not use the account intracomm or
export.
2019-10-21 05:24:54 +02:00
Laurent Destailleur
776bfabfc4 FIX If country not defined keep value empty 2019-10-21 05:24:42 +02:00