lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
91,219 Commits 43 Branches 150 Tags 886 MiB
scrutinizer-patch-1
Commit Graph

2005 Commits

Author SHA1 Message Date
Philippe Grand
e7c2bd830a
fix merge issue 2020-05-23 10:17:48 +02:00
Philippe Grand
b137775046
fix merge issue 2020-05-23 10:12:14 +02:00
Frédéric FRANCE
b41ac00b98
add new rule 2020-05-21 15:05:19 +02:00
Philippe GRAND
23282acfbc update 2020-05-21 11:20:01 +02:00
Frédéric FRANCE
43dcd9beb5
add new rule 2020-05-21 00:02:33 +02:00
Alexandre SPANGARO
1f46c57c0b NEW Add employee in expense report binding page 2020-05-19 09:36:07 +02:00
Laurent Destailleur
bd564486ff Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-17 20:03:09 +02:00
Laurent Destailleur
af46108cc4 Look and feel v12 2020-05-17 13:34:16 +02:00
Laurent Destailleur
70fc74008a Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/balance.php
 2020-05-15 17:19:43 +02:00
Laurent Destailleur
86ff60f161 Fix break line and set of opportunity fields 2020-05-15 15:50:50 +02:00
Scrutinizer Auto-Fixer
9699ee7263 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-05-15 11:55:31 +00:00
Laurent Destailleur
aed917bda9
Merge pull request #13862 from aspangaro/12.0_a27 
NEW Accountancy balance - Add a input to show subtotal by group
 2020-05-14 16:40:02 +02:00
Laurent Destailleur
ebbd4413f5 Fix scrutinizer error 2020-05-13 00:47:27 +02:00
Alexandre SPANGARO
6b57ae4fcb Merge remote-tracking branch 'upstream/develop' into 12.0_a27 2020-05-12 07:27:35 +02:00
Alexandre SPANGARO
0dccc9cbeb Debug colspan 2020-05-12 07:27:20 +02:00
Laurent Destailleur
e5fa5be0e5
Merge pull request #13861 from aspangaro/12.0_a26 
NEW Bookkeeping by account - Look & feel v12
 2020-05-12 03:02:32 +02:00
Laurent Destailleur
4584fa1aa6 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/asset/list.php
	htdocs/compta/bank/list.php
	htdocs/contrat/services_list.php
	htdocs/core/lib/date.lib.php
	htdocs/expensereport/list.php
	htdocs/fichinter/list.php
	htdocs/holiday/list.php
	htdocs/projet/tasks/list.php
	htdocs/supplier_proposal/list.php
	htdocs/user/list.php
 2020-05-11 19:43:06 +02:00
Alexandre SPANGARO
04480847df NEW Accountancy balance - Add a button ShowSubtotalByGroup 2020-05-10 08:28:03 +02:00
stickler-ci
ff578198d6 Fixing style errors. 2020-05-10 04:35:52 +00:00
Alexandre SPANGARO
f40e978475 Fix delbookkeepingyear - add hook printFieldPreListTitle - Look & Feel v12 2020-05-10 06:28:50 +02:00
Alexandre SPANGARO
12fb1658ce Merge remote-tracking branch 'upstream/develop' into 12.0_a26 2020-05-08 20:45:52 +02:00
stickler-ci
7ad80c9bf6 Fixing style errors. 2020-05-08 11:53:11 +00:00
Alexandre SPANGARO
640158ea4c NEW Accountancy - Add Fiducial Winfic eWinfic WinSis Compta 2020-05-08 13:50:26 +02:00
Alexandre SPANGARO
40ffbbe616 Debug 2020-05-08 13:28:56 +02:00
Alexandre SPANGARO
a49635a825 NEW Bookkeeping by account - Add selectfields & hook 2020-05-08 07:45:01 +02:00
Maxime Kohlhaas
1a9afe6b20 Fix missing hook params for printFieldListValue 2020-05-08 01:40:25 +02:00
Laurent Destailleur
dc24738f93 Group columns about thirdparty data together 2020-05-01 22:34:49 +02:00
Laurent Destailleur
16e4c25caf
Merge pull request #13761 from aspangaro/12.0_a26 
NEW: Accountancy add column thirdparty on binding page
 2020-05-01 22:25:49 +02:00
Laurent Destailleur
625c7216a9 Can show date of validation in list 2020-04-30 19:51:24 +02:00
Laurent Destailleur
e4edd143c5 Fix field name 2020-04-30 19:41:46 +02:00
Laurent Destailleur
483935493c Fix look and feel 2020-04-28 18:08:26 +02:00
Alexandre SPANGARO
1f6c959b72 NEW: Accountancy add column thirdparty on binding page 2020-04-28 04:55:54 +02:00
Alexandre SPANGARO
b3efa4f793 Merge remote-tracking branch 'upstream/develop' into 12.0_a26 2020-04-28 04:45:24 +02:00
Alexandre SPANGARO
31583c9b63 NEW: Accountancy add column thirdparty on binding page 2020-04-28 04:45:06 +02:00
Laurent Destailleur
4c605283f5 Fix phpcs 2020-04-27 00:09:21 +02:00
Laurent Destailleur
c0821a8ed6 Fix phpcs 2020-04-27 00:02:31 +02:00
Laurent Destailleur
31157931a9 Fix phpcs 2020-04-26 23:52:23 +02:00
Laurent Destailleur
b20d85b198 Fix phpcs 2020-04-26 23:06:52 +02:00
Laurent Destailleur
6b114a31ce Look and feel v12 2020-04-25 03:00:41 +02:00
Laurent Destailleur
c9f242406c Look and feel v12 2020-04-25 02:44:24 +02:00
Laurent Destailleur
f7d4d78008 Fix error 500 2020-04-23 17:55:55 +02:00
Laurent Destailleur
cd1368cb71 Fix dispatch in ledger for various payment done in same account when 
there is 2 different transaction in 2 different account (backport v12)
 2020-04-23 17:10:40 +02:00
Laurent Destailleur
042fb4641f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/de_DE/install.lang
	htdocs/langs/de_DE/main.lang
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/cashdesk.lang
	htdocs/langs/fr_FR/errors.lang
	htdocs/langs/fr_FR/projects.lang
 2020-04-21 18:33:11 +02:00
Laurent Destailleur
f8ae5d9972 Fix Do not show value if null 2020-04-21 12:00:14 +02:00
Laurent Destailleur
13eb1ca28d Fix link 2020-04-18 04:40:33 +02:00
Alexandre SPANGARO
b607c83b8a Fix : Accountancy - Error on buy accountancy account suggest 2020-04-16 16:13:52 +02:00
Laurent Destailleur
b6baba7651 Removed deprecated var 2020-04-12 18:59:22 +02:00
Laurent Destailleur
267677a925 Fix phpcs 2020-04-10 14:02:35 +02:00
Scrutinizer Auto-Fixer
444c293c01 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-04-10 08:59:32 +00:00
Laurent Destailleur
b8c2dd6025 Look and feel v12 2020-04-02 15:11:46 +02:00
Laurent Destailleur
84cda962c1 Clean dead code 2020-04-02 12:03:29 +02:00
Laurent Destailleur
a05f9fad33 FIX Look and feel v11 2020-03-26 01:25:10 +01:00
Laurent Destailleur
82825f143b FIX Look and feel v11 2020-03-26 01:24:05 +01:00
Laurent Destailleur
59f66ce9bd Type of var 2020-03-25 11:32:24 +01:00
Laurent Destailleur
a5379c7144 FIX All forms must use newToken() 
Conflicts:
	htdocs/commande/card.php
	htdocs/compta/cashcontrol/cashcontrol_card.php
	htdocs/supplier_proposal/card.php
 2020-03-24 13:14:23 +01:00
Laurent Destailleur
1ff15e1fd9 FIX All forms must use newToken() 2020-03-24 13:10:35 +01:00
Scrutinizer Auto-Fixer
e8083e2a65 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-03-23 14:54:02 +00:00
Laurent Destailleur
25b62646b6 Fix we must supplier codes 2020-03-18 20:26:28 +01:00
Laurent Destailleur
009746ab79 Invert seller and buyer 2020-03-18 19:59:18 +01:00
Laurent Destailleur
6298071f83 CSS 2020-03-18 19:55:49 +01:00
Laurent Destailleur
aeae8b4300
Merge pull request #13348 from aspangaro/12.0_a21 
Work on reconcilation of accouting account
 2020-03-18 18:56:03 +01:00
stickler-ci
74655b759c Fixing style errors. 2020-03-16 16:34:28 +00:00
florian HENRY
105c2e9978 fix ldcompta10 2020-03-16 17:31:16 +01:00
Alexandre SPANGARO
191374cc8f Work on reconcilation of accouting account 2020-03-16 08:07:05 +01:00
Alexandre SPANGARO
af5444806d Work on reconcilation of accouting account 2020-03-16 06:41:14 +01:00
Laurent Destailleur
891bc52532
Update accountingaccount.class.php 2020-03-15 11:12:10 +01:00
Laurent Destailleur
1a273551be
Update accountingaccount.class.php 2020-03-15 11:11:12 +01:00
stickler-ci
375bcf8720 Fixing style errors. 2020-03-15 07:01:36 +00:00
Alexandre SPANGARO
bc717bc6ae Work on reconciliation of accouting account 2020-03-15 07:49:24 +01:00
Laurent Destailleur
6e71bb8707 Look and feel v12: Use color of status for dotnuts 2020-03-14 02:17:08 +01:00
Laurent Destailleur
3b72005f93 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/card.php
	htdocs/filefunc.inc.php
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/cashdesk.lang
	htdocs/langs/fr_FR/errors.lang
	htdocs/langs/fr_FR/products.lang
	htdocs/langs/fr_FR/projects.lang
 2020-03-14 00:22:11 +01:00
Laurent Destailleur
30bcf1d244 Uniformize code 2020-03-13 18:51:58 +01:00
Laurent Destailleur
880cfd1659 FIX #13332 Add more details on screen and help so it is easier to 
understand the choices of the computer. Copy code into the automatic
binding to have rule consistent.
 2020-03-13 18:10:00 +01:00
Laurent Destailleur
41a2304470
Merge pull request #13332 from aspangaro/12.0_a21 
FIX: Accounting management of intra-community sales to a non-taxable thirdparty
 2020-03-13 17:01:13 +01:00
Laurent Destailleur
618d276349
Merge pull request #13335 from FHenry/dev_ldcompta10 
NEW : accounting export LD compta version 10
 2020-03-13 16:55:42 +01:00
Laurent Destailleur
33c5db9cc3 Prepare code for the new pagination possibility 2020-03-13 13:07:11 +01:00
Scrutinizer Auto-Fixer
f413ce6aac Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-03-12 11:45:44 +00:00
florian HENRY
8e473ee365 Merge branch 'dev_ldcompta10' of github.com:FHenry/dolibarr into dev_ldcompta10 2020-03-12 12:28:30 +01:00
florian HENRY
c5a4adf63f update doc 2020-03-12 12:25:19 +01:00
stickler-ci
85c8296e10 Fixing style errors. 2020-03-12 10:59:08 +00:00
florian HENRY
310bdf6062 NEW : accounting export LD compta version 10 2020-03-12 11:55:26 +01:00
Alexandre SPANGARO
59e4b3d634 FIX: Accounting management of intra-community sales to a non-taxable thirdparty 
Related to this discussion :

https://www.dolibarr.fr/forum/t/gestion-des-comptes-de-vente-intracommunautaire-et-vente-ce-non-exemptee-de-tva/32285
 2020-03-12 04:56:36 +01:00
Laurent Destailleur
89a8531140
Merge pull request #13237 from aspangaro/12.0_a18 
NEW: Accountancy - Add mode intra & export for product or service bought
 2020-03-11 17:08:49 +01:00
Scrutinizer Auto-Fixer
4ab671338b Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-03-06 13:11:44 +00:00
Laurent Destailleur
60eabb0e8a Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-03-04 02:15:51 +01:00
Laurent Destailleur
24f416d0dd Fix default content of page 2020-03-04 02:03:29 +01:00
Alexandre SPANGARO
99b02fca47 Fix error 2020-03-03 05:18:45 +01:00
Alexandre SPANGARO
278dfce301 Fix not logical use 2020-03-03 05:16:14 +01:00
Alexandre SPANGARO
fbd7dc66b2 Fix error 2020-03-03 05:06:31 +01:00
Laurent Destailleur
c47ddb8bca
Merge pull request #13245 from aspangaro/12.0_a19 
NEW: Bookkeeping - Add link to document & pdf
 2020-03-02 21:44:27 +01:00
Alexandre SPANGARO
cdca4ca0aa NEW: Bookkeeping - Add link to document & pdf 2020-03-02 09:01:25 +01:00
Alexandre SPANGARO
be8ed42450 NEW: Bookkeeping - Add link to document & pdf 2020-03-01 23:17:40 +01:00
Alexandre SPANGARO
6982997de5 Fix error 2020-03-01 05:09:57 +01:00
Alexandre SPANGARO
d9b9913e8a NEW: Accountancy - Add mode intra & export for product or service bought 2020-03-01 04:52:12 +01:00
Laurent Destailleur
f2dba4f621
Merge pull request #13227 from aspangaro/12.0_a16 
NEW: Accountancy - Remove pcg_subtype - Useless fonctionnality
 2020-02-29 13:02:43 +01:00
Laurent Destailleur
8879672122 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-02-29 12:52:18 +01:00
Laurent Destailleur
0855598c00 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/accountancy/journal/purchasesjournal.php
	htdocs/accountancy/journal/sellsjournal.php
	htdocs/core/lib/functions.lib.php
 2020-02-29 12:51:33 +01:00
Laurent Destailleur
c3ab1055bf Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-02-29 12:48:40 +01:00
Laurent Destailleur
52a92924de
Merge pull request #13230 from atm-gauthier/fix_round_accountancy 
FIX : round MT in accountancy books
 2020-02-29 12:35:33 +01:00
gauthier
284a4189b3 FIX : round MT in accountancy books 2020-02-28 14:32:35 +01:00
Alexandre SPANGARO
86d9622360 NEW: Accountancy - Remove pcg_subtype - Useless fonctionnality 2020-02-27 10:44:04 +01:00
Laurent Destailleur
9f097b1a08 FIX #13146 #13198 2020-02-26 15:45:21 +01:00
Laurent Destailleur
1583bed0e4 FIX #13146 #13198 2020-02-26 15:41:46 +01:00
Laurent Destailleur
d172a95dfe Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-02-25 14:37:04 +01:00
Laurent Destailleur
2067abdc7e Fix title of page 2020-02-24 23:10:04 +01:00
Laurent Destailleur
2118c2eede Fix missing title line 2020-02-24 23:04:17 +01:00
Laurent Destailleur
4b4d1bcce2 Fix disable accountancy chart that is deprecated. 2020-02-24 03:05:58 +01:00
Philippe GRAND
95228ae01c fix merging 2020-02-22 12:21:17 +01:00
Scrutinizer Auto-Fixer
e44865d8b5 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-02-21 16:53:37 +00:00
Scrutinizer Auto-Fixer
fd48877dc6 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-02-18 22:47:25 +00:00
Laurent Destailleur
a6b0fec90b Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/exports/class/export.class.php
 2020-02-17 12:35:34 +01:00
Laurent Destailleur
504a67daee FIX duplicate class name into some log lines 2020-02-17 12:34:00 +01:00
Laurent Destailleur
f4f3efec62 Fight against $_POST 2020-02-16 19:33:58 +01:00
Laurent Destailleur
a312adf2b0 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/balance.php
 2020-02-14 19:57:31 +01:00
Laurent Destailleur
d3d572c8d3 FIX Avoid to download the export if we just press enter to refresh form 2020-02-14 19:55:50 +01:00
Laurent Destailleur
a7df72ee6f FIX #13067 2020-02-14 19:34:26 +01:00
Laurent Destailleur
58a2a71605
Merge pull request #13067 from maboelfotoh/custom 
NEW add Opening Balance column to balance.php
 2020-02-14 19:25:18 +01:00
Laurent Destailleur
35ada37d4d Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/comm/propal/list.php
	htdocs/filefunc.inc.php
 2020-02-14 19:14:26 +01:00
Laurent Destailleur
58ad62aa7b Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-02-14 19:12:11 +01:00
Laurent Destailleur
3bc122ecf6 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-02-14 19:05:58 +01:00
Laurent Destailleur
3faed758b3 FIX #13110 2020-02-14 19:05:39 +01:00
Laurent Destailleur
4d29cb17de FIX #13110 2020-02-14 19:04:08 +01:00
Alexandre SPANGARO
72e59e6fe2 FIX: Force FEC export to txt format 2020-02-14 16:07:06 +01:00
Muhammad Aboelfotoh
ce6cf04028 Add new view for balance.php that additionally shows opening balance 2020-02-13 13:53:07 +00:00
Laurent Destailleur
4762bafb02 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/subscription/list.php
	htdocs/mrp/class/mo.class.php
 2020-02-12 22:58:37 +01:00
Laurent Destailleur
ccced09113 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/adherents/subscription/list.php
	htdocs/comm/propal/list.php
	htdocs/core/class/html.formmail.class.php
 2020-02-12 22:54:55 +01:00
Laurent Destailleur
7931734ecb Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/modUser.class.php
 2020-02-12 20:30:20 +01:00
Laurent Destailleur
50f0b61f1e
Update bankjournal.php 2020-02-12 18:50:33 +01:00
Laurent Destailleur
ccb895e251
Merge pull request #13083 from atm-greg/FIX_bookkeeping_LD_Compta_Export 
fix missing fields in LD Compta Export
 2020-02-12 18:41:34 +01:00
Laurent Destailleur
03a8414ba8 FIX #13085 2020-02-12 18:21:45 +01:00
Pierre Ardoin
c7181830fc
Fix the display of the banner with multicompany 
Before : if a account of a entity require to define the Journal code, Banner displayed in all entities.

Now : Show the banner only in the entity concerned.
 2020-02-12 09:11:39 +01:00
stickler-ci
fc170c1081 Fixing style errors. 2020-02-11 15:20:46 +00:00
atm-greg
66f6d1bfd4 add missing fields 2020-02-11 15:57:49 +01:00
Laurent Destailleur
2e0929c2e9 FIX export ledger 2020-02-05 16:08:28 +01:00
Laurent Destailleur
e81bcbde31 FIX export ledger 2020-02-05 16:08:00 +01:00
Laurent Destailleur
8098456f67 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-02-03 02:52:46 +01:00
Laurent Destailleur
d4c16c6590
Merge pull request #12981 from oscim/patch-17 
Update thirdparty_lettering_supplier.php
 2020-02-02 20:01:47 +01:00
Alexandre SPANGARO
e8b9ca3276 FIX: FEC export have specific name 2020-02-01 08:23:19 +01:00
Alexandre SPANGARO
0229cd3c65 FIX: FEC export have specific name 2020-02-01 08:18:48 +01:00
oscim
ed68ae0574
Update thirdparty_lettering_supplier.php 
fix form in fiscalyear lasted validated
 2020-01-31 08:50:41 +01:00
oscim
a0d3370b86
Update lettering.class.php 
add check colum date_validated IS NULL for block process lettering in fiscalyear is lasted validated
 2020-01-31 08:43:09 +01:00
Laurent Destailleur
b2d0b47ec9
Merge pull request #12970 from Dolibarr/scrutinizer-patch-6 
Scrutinizer Auto-Fixes
 2020-01-30 11:35:55 +01:00
Scrutinizer Auto-Fixer
5fda829023 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-01-30 00:48:28 +00:00
Laurent Destailleur
2791f10e18
Merge pull request #12934 from aspangaro/12.0_a10 
NEW: Accountancy - General ledger - Add an option to search not reconciled line
 2020-01-30 01:48:21 +01:00
Laurent Destailleur
7b10c2440b Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-29 23:08:42 +01:00
Laurent Destailleur
af61c19ffd Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-01-29 23:06:21 +01:00
altairis
f1ea0ce5a1 better fix 2020-01-29 11:47:23 +01:00
altairis
b04bb9e392 FIX : fetching account on current entity 2020-01-29 11:05:10 +01:00
Alexandre SPANGARO
074e55fca5 NEW: Accountancy - General ledger - Add an option to search not reconciled line 2020-01-28 22:56:26 +01:00
Laurent Destailleur
9acda3545e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-28 17:52:01 +01:00
Laurent Destailleur
c87fdc96ce Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/accountancy/supplier/index.php
 2020-01-28 17:51:32 +01:00
Laurent Destailleur
782be2ac37 FIX Invert isSellerInEEC and isBuyerInEEC 2020-01-28 17:50:08 +01:00
Laurent Destailleur
bffdc63ec6 FIX The "automatic bind" was linked EEC to export accountancy code 
Conflicts:
	htdocs/accountancy/supplier/index.php
 2020-01-28 17:48:34 +01:00
Laurent Destailleur
86c10a124a Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-28 17:44:53 +01:00
Laurent Destailleur
e9de1e16e8 FIX The "automatic bind" was linked EEC to export accountancy code 2020-01-28 17:44:05 +01:00
Laurent Destailleur
80707d6a5e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-28 17:24:26 +01:00
Laurent Destailleur
f5ce0fc811 Fix seach on country 2020-01-28 17:22:26 +01:00
Philippe GRAND
c736d9ae25 fix merging 2020-01-27 09:48:38 +01:00
Alexandre SPANGARO
d5ff006171 NEW: Accountancy - General ledger - Add an option to search not lettering line 2020-01-27 05:20:48 +01:00
Laurent Destailleur
27a0858050 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/product/stock/class/mouvementstock.class.php
 2020-01-23 17:41:31 +01:00
Laurent Destailleur
7ad827f212 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/accountancy/class/accountancyexport.class.php
 2020-01-23 12:09:01 +01:00
Laurent Destailleur
be344518c4 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/accountancy/class/accountancyexport.class.php
	htdocs/core/lib/functions2.lib.php
 2020-01-23 12:07:17 +01:00
Alexandre SPANGARO
7f47b48559 Move function to functions2.lib.php 2020-01-23 11:47:30 +01:00
Alexandre SPANGARO
5eeef771fa FIX: FEC export format 2020-01-23 06:20:31 +01:00
Laurent Destailleur
d329c4ad38 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-21 22:39:30 +01:00
Laurent Destailleur
69fae5a679 Fix search on accounting account when option to padd 0 is on. 2020-01-21 22:38:03 +01:00
Laurent Destailleur
c7617279de Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-21 22:27:00 +01:00
Laurent Destailleur
80648db7fc Fix search on accounting account when option to padd 0 is on. 2020-01-21 22:26:37 +01:00
Laurent Destailleur
ff9a2608d8 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/admin/account.php
 2020-01-21 22:22:16 +01:00
Laurent Destailleur
8f1737952d Fix search on accounting account when option to padd 0 is on. 2020-01-21 22:20:32 +01:00
Laurent Destailleur
a36b0ea4f5 Fix filter on parent account in list of accounting accounts 2020-01-21 21:36:40 +01:00
Alexandre SPANGARO
f4cd3236b1 Fix : Accounting - error on right 2020-01-19 21:59:01 +01:00
Laurent Destailleur
5772dce460 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/functions.lib.php
 2020-01-15 12:09:21 +01:00
Laurent Destailleur
9ceec670b9 Fix date format in FEC export 2020-01-13 13:52:48 +01:00
Laurent Destailleur
22d4f37e58 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/core/class/html.form.class.php
 2020-01-10 14:31:37 +01:00
Laurent Destailleur
b47db086cb Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/product/inventory/class/inventory.class.php
	htdocs/product/inventory/list.php
 2020-01-10 14:30:42 +01:00
Laurent Destailleur
675ce3b32f Fix sql error on update of subledger account on a various payment 
Fix warning message that was not accurate
 2020-01-10 02:20:08 +01:00
Alexandre SPANGARO
c3518426bd NEW Accountancy - Add possibility to manage an short alternative label - use to simplify 2020-01-03 22:05:49 +01:00
Laurent Destailleur
513b9b26a6
Merge branch 'develop' into 9.0_p4 2019-12-31 16:38:37 +01:00
Alexandre SPANGARO
77e3b01179 Fix Accountancy - Set NULL when data is empty 2019-12-31 08:00:20 +01:00
Laurent Destailleur
d1fdd11b37 Close #10907 2019-12-19 11:32:10 +01:00
Laurent Destailleur
f44b85f557 Fix $_SESSION['newtoken'] must be newToken() 2019-12-18 23:12:31 +01:00
Scrutinizer Auto-Fixer
404ae0c209 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-12-17 02:00:52 +00:00
Laurent Destailleur
a3fa6eb473 Debug v11 2019-12-16 19:40:18 +01:00
Laurent Destailleur
5c8733a84b More complete message 2019-12-16 19:30:18 +01:00
Laurent Destailleur
e3cc541ff2 Fix debug code 2019-12-16 19:19:37 +01:00
Laurent Destailleur
d22cd5c321 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/accountancy/bookkeeping/list.php
 2019-12-16 19:09:53 +01:00
Laurent Destailleur
65abe7532c Fix error message not reported when deleting record in ledger. 2019-12-16 19:05:32 +01:00
Laurent Destailleur
1af67a4336
Merge pull request #12713 from frederic34/doxygen_warning 
doxygen
 2019-12-16 19:02:10 +01:00
Scrutinizer Auto-Fixer
c8baaa2995 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-12-16 12:06:25 +00:00
Laurent Destailleur
fdf4d86d81 Debug code 2019-12-16 12:38:51 +01:00
Laurent Destailleur
646587a9cf Value "None" To unbind is more visible. 2019-12-16 11:50:25 +01:00
Frédéric FRANCE
9e4fb8d4fe
doxygen 2019-12-15 10:02:20 +01:00
Laurent Destailleur
835d22f556
Merge branch 'develop' into doxygen_todo 2019-12-14 13:46:40 +01:00
Laurent Destailleur
ce47de453e Fix HTML5 2019-12-12 10:31:08 +01:00
Frédéric FRANCE
66805a502a
doxygen 2019-12-11 22:53:57 +01:00
Philippe GRAND
9996c1ca7a fix : invoid sql injection 2019-11-21 09:49:53 +01:00
Philippe GRAND
54d67de538 fix : invoid sql injection 2019-11-21 09:44:13 +01:00
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