lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
121,269 Commits 43 Branches 150 Tags 886 MiB
add_rest_api_region
Commit Graph

3191 Commits

Author SHA1 Message Date
Laurent Destailleur
dce996a53f Reponsive 2022-02-14 12:28:11 +01:00
Alexandre SPANGARO
0d1ee4e19f Fix stickler-ci 2022-02-14 11:51:05 +01:00
Alexandre SPANGARO
a17ac09fd0 Resolve stickler-ci 2022-02-14 11:03:44 +01:00
stickler-ci
dd5be840aa Fixing style errors. 2022-02-14 03:31:30 +00:00
Alexandre SPANGARO
d5e521c87b Accountancy 2022-02-14 04:27:52 +01:00
Alexandre SPANGARO
9349e2df7c FIX Accountancy - Order by accounting account on summary page 2022-02-13 21:11:45 +01:00
Laurent Destailleur
a1f88c1186 Fix reponsive 2022-02-13 18:03:29 +01:00
Laurent Destailleur
a52f1d1094 Reponsive 2022-02-13 17:33:45 +01:00
Laurent Destailleur
3b18462a62 # WARNING: head commit changed in the meantime 
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
 2022-02-07 15:51:01 +01:00
Laurent Destailleur
7f04b7dc3d Fix button Cancel 2022-02-07 15:26:03 +01:00
Laurent Destailleur
abc5a93d99
Merge pull request #19827 from defrance/patch-175 
NEW : use addMoreActionsButtonsList hook in list
 2022-01-26 14:19:14 +01:00
Laurent Destailleur
cb45f79ab0 Fix scrutinizer 2022-01-13 20:16:12 +01:00
Laurent Destailleur
fccddd7805 Fix property missing 2022-01-13 20:11:18 +01:00
Laurent Destailleur
965703e04a Fix missing var 2022-01-13 20:09:40 +01:00
Laurent Destailleur
3aea037889 FIX Debug level 3 of accounting account was using wront field 2022-01-13 19:49:38 +01:00
Laurent Destailleur
b6dc7a3f19 Doc 2022-01-13 19:09:34 +01:00
BENKE Charlene
90829bd255
Update listbysubaccount.php 2022-01-13 12:23:14 +01:00
BENKE Charlene
05603730ca
Update listbyaccount.php 2022-01-13 12:22:45 +01:00
BENKE Charlene
c4c43fc9f9
Update list.php 2022-01-13 12:22:16 +01:00
BENKE Charlene
cc6dd99bf6
NEW : addMoreActionsButtonsList hook for button in list 2022-01-13 12:20:54 +01:00
Laurent Destailleur
13510b9929 Clean sortfield, sortorder 2022-01-13 11:17:25 +01:00
Laurent Destailleur
ef56631c80 FIX #yogosha8186 2022-01-03 18:15:19 +01:00
Alexandre SPANGARO
37033b04be FIX Accountancy - Separator problem with FEC/FEC2 export format 2021-12-20 07:04:12 +01:00
Laurent Destailleur
477e9ddd4c Try to complete fix 2021-12-19 01:04:24 +01:00
Laurent Destailleur
fbce09f21b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/customer/index.php
	htdocs/compta/facture/card.php
	htdocs/reception/card.php
 2021-12-19 00:36:22 +01:00
Laurent Destailleur
6643a05216 php 8 2021-12-19 00:19:17 +01:00
Laurent Destailleur
d46ef9c42a css 2021-12-18 23:51:14 +01:00
Laurent Destailleur
8925a8041a Fix trforbreak 2021-12-18 23:16:46 +01:00
Laurent Destailleur
80a7b83956 Debug status of accounting account 2021-12-18 23:02:31 +01:00
Laurent Destailleur
5fed6de5b8 Fix feature to close record in accounting 2021-12-18 22:53:30 +01:00
Laurent Destailleur
0fe1634f29 Fix missing print 2021-12-18 22:36:32 +01:00
Laurent Destailleur
2335cf5fb4 css 2021-12-18 22:19:21 +01:00
Laurent Destailleur
fa5d96d562 Add more info to help debug 2021-12-18 16:48:08 +01:00
Laurent Destailleur
fde9a6667f Fix colspan 2021-12-18 15:46:08 +01:00
Laurent Destailleur
e17ddee559
Merge pull request #19396 from FHenry/14.0_fix_margin_cal_with_depositinvoice 
fix: #ZENDSI fix margin calc with credit note
 2021-12-16 18:48:27 +01:00
Laurent Destailleur
d92535ec59 FIX Debug transfert in accountancy for expense report 2021-12-16 15:41:23 +01:00
Laurent Destailleur
582caf0e7a FIX message for automatic binding not clear of what was done or not 2021-12-13 19:04:25 +01:00
Laurent Destailleur
e7b7c3281e Fix page of accountancy transaction 2021-12-13 17:42:10 +01:00
Laurent Destailleur
8bace4c64e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-11-30 16:24:42 +01:00
Laurent Destailleur
a298a845f1 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/list.php
	htdocs/core/actions_massactions.inc.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/lib/memory.lib.php
	htdocs/langs/en_US/holiday.lang
	htdocs/ticket/card.php
 2021-11-30 16:24:18 +01:00
Christian Foellmann
6608f5f0d8 update all script tags to be uniform. language="javascript" removed 
https://developer.mozilla.org/en-US/docs/web/html/element/script#attr-language
 2021-11-29 15:09:18 +01:00
Laurent Destailleur
186185267e Clean code for v15 2021-11-29 00:49:18 +01:00
Frédéric FRANCE
e562bf5b1c
can modify tooltip by reference 2021-11-22 20:08:21 +01:00
Frédéric FRANCE
c01cc0c212
can modify tooltip by reference 2021-11-22 20:06:51 +01:00
Alexandre SPANGARO
b28b12f93a FIX Accountancy - SQL error on subledger account search in journal 2021-11-22 16:19:01 +01:00
Laurent Destailleur
f484fc2710 NEW On the summary of lines to link, can zoom on month. 2021-11-22 05:21:24 +01:00
Laurent Destailleur
2975d47113 FIX Debug a lot of regression in accountancy transfer 2021-11-22 04:13:16 +01:00
Laurent Destailleur
290a6c3d58 Prepare code to allow to filter autolink on month/year 2021-11-22 03:34:50 +01:00
Laurent Destailleur
a1c1999d7d Fix param on link to automatically bind transaction on product account 2021-11-22 03:22:15 +01:00
Laurent Destailleur
441af6b6fb Fix add rel="noopener noreferrer" 2021-11-22 02:35:55 +01:00
Florian HENRY
0e8e8a79dc review code 2021-11-18 21:12:43 +01:00
Florian HENRY
e4803dda88 ZENDSI: fix margin calc with credit note 2021-11-16 17:46:12 +01:00
Florian HENRY
8bb7f9c8fb ZENDSI: fix margin calc with credit note 2021-11-16 17:44:18 +01:00
Florian HENRY
7380f5901b ZENDSI: fix margin calc with credit note 2021-11-16 17:41:38 +01:00
Gauthier PC portable 024
dd23057516 NEW : accountancy massaction preselect account (customer and supplier list) 2021-11-15 14:54:09 +01:00
Gauthier PC portable 024
7d1b409e59 NEW : accountancy massaction preselect account (productaccount page) 2021-11-15 14:35:55 +01:00
Laurent Destailleur
5a1f54f47f Fix transfer in accountancy for supplier invoices 2021-11-15 09:57:41 +01:00
Laurent Destailleur
5dd2bedffa Fix fatal error 2021-11-15 09:42:27 +01:00
Laurent Destailleur
67d69e5cd6 Fix autocheck if vat rate seems wrong 2021-11-15 09:14:58 +01:00
Laurent Destailleur
5b5f41606a NEW PDF generation support format PDF/A-1b and PDF/A-3b 2021-11-15 09:02:01 +01:00
Laurent Destailleur
2857619316 Clean code 2021-11-14 19:33:54 +01:00
Laurent Destailleur
e29ef08ee7 Fix regression in default set of accounting accounts 2021-11-14 19:10:06 +01:00
Laurent Destailleur
8954f7415b Fix warning on vat possible anomaly. 2021-11-14 18:40:25 +01:00
Alexandre SPANGARO
d611b99d95 GNU version 3 2021-11-09 03:01:48 +01:00
Laurent Destailleur
5085db36a7 Clean code 2021-11-07 18:54:59 +01:00
Laurent Destailleur
9fd5727985 Try to fix some regressions 2021-11-07 18:47:27 +01:00
Laurent Destailleur
dd2207d6c5 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/customer/list.php
	htdocs/core/db/DoliDB.class.php
	htdocs/resource/list.php
 2021-11-06 21:11:05 +01:00
Laurent Destailleur
b4895c4dd2
Merge pull request #18975 from aspangaro/14p23 
FIX Accountancy - If deposit invoice is used, force binding in deposit accounting account to solve transaction
 2021-10-31 18:13:54 +01:00
Laurent Destailleur
d891dd8ddc Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/stocks.lang
	htdocs/product/stats/card.php
	htdocs/projet/element.php
	htdocs/salaries/card.php
 2021-10-31 16:19:10 +01:00
Alexandre SPANGARO
da52742421 FIX Accountancy - Product admin - SQL error when we affect accounting account with product_perentity activated 2021-10-29 05:47:29 +02:00
Alexandre SPANGARO
a129e91198 Merge branch '14.0' into 14p23 2021-10-26 06:23:31 +02:00
Laurent Destailleur
e12d9ee979
Merge pull request #19156 from frederic34/defaultvaluegetglobal 
can specify default in getDolGlobalString and getDolGlobalInt
 2021-10-23 22:42:40 +02:00
Laurent Destailleur
dc1e57e267
Merge pull request #19155 from frederic34/patch-1 
fix warnings
 2021-10-23 22:41:05 +02:00
Frédéric FRANCE
cb66b71017
Update journals_list.php 2021-10-23 21:39:07 +02:00
Frédéric FRANCE
1639eae92e
fix warning remove unused 2021-10-23 21:37:17 +02:00
Frédéric FRANCE
29371487a0
fix warning 2021-10-23 21:14:32 +02:00
Frédéric FRANCE
635cb34606
fix warning 2021-10-23 21:10:43 +02:00
Frédéric FRANCE
08e5b55d16
can specify default in getDolGlobalString and getDolGlobalInt 2021-10-23 21:06:37 +02:00
Frédéric FRANCE
cdba9909be
fix warnings 2021-10-23 20:53:46 +02:00
Laurent Destailleur
757d841f15 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-10-23 17:20:00 +02:00
Laurent Destailleur
8604f9b153 Clean DOM (remove ficheaddleft div) 2021-10-23 17:18:35 +02:00
Philippe GRAND
ce75806728 fix scrutinizer : The property datef does not exist on Facture 2021-10-23 11:46:54 +02:00
Laurent Destailleur
6ec19bca9d
Merge pull request #19128 from frederic34/warnfixes 
fix warnings
 2021-10-23 11:38:03 +02:00
Laurent Destailleur
df1d8b02c7
Merge pull request #19129 from frederic34/patch-4 
fix warnings
 2021-10-23 11:37:52 +02:00
Frédéric FRANCE
21aaed4a86
Update closure.php 2021-10-23 07:40:36 +02:00
Frédéric FRANCE
93e223bf84
fix warnings 2021-10-23 07:38:10 +02:00
Frédéric FRANCE
57bac4f5db
fix warnings 2021-10-23 07:29:12 +02:00
Frédéric FRANCE
9bd31d2b85
fix warnings 2021-10-23 07:13:08 +02:00
Laurent Destailleur
81f2a21954
Merge pull request #18942 from aspangaro/15a25 
NEW Accountancy - rewrite bind accountancy code finding on purchase invoice
 2021-10-22 22:56:24 +02:00
Laurent Destailleur
ea28256635
Merge pull request #19120 from frederic34/patch-5 
fix warning
 2021-10-22 22:47:57 +02:00
Frédéric FRANCE
46c4f28478
fix multiple warnings 2021-10-22 22:15:59 +02:00
Frédéric FRANCE
e82a07085f
Update subaccount.php 2021-10-22 22:08:38 +02:00
Frédéric FRANCE
e411e23082
Update card.php 2021-10-22 22:08:13 +02:00
Frédéric FRANCE
6e2f438830
Update accountmodel.php 2021-10-22 22:07:47 +02:00
Frédéric FRANCE
9ca8dfcef9
fix warning 2021-10-22 22:05:04 +02:00
Alexandre SPANGARO
40a23e4aa4 Update work, thanks Florian 2021-10-22 17:12:44 +02:00
Alexandre SPANGARO
0cbfdb4219 Merge remote-tracking branch 'upstream/develop' into 15a25 2021-10-22 16:49:47 +02:00
Laurent Destailleur
6c870bb3d1
Merge pull request #19059 from FHenry/fix_introduced_scrutinizer 
fix: scrutinizer
 2021-10-21 22:52:20 +02:00
Florian HENRY
0589c9c3ca fix: scrutinizer 2021-10-21 15:55:11 +02:00
Florian HENRY
f783dd56a4 fix: scrutinizer 2021-10-21 15:54:23 +02:00
Laurent Destailleur
e43b33028c Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/card.php
 2021-10-20 15:06:10 +02:00
Laurent Destailleur
766463a0b2
Merge pull request #18966 from aspangaro/14p22 
Accountancy - Show message for admin if accountancy hidden options are activated to help to resolve some problems
 2021-10-20 12:51:29 +02:00
Alexandre SPANGARO
2dc997528b Merge branch '14.0' into 14p23 2021-10-20 07:42:01 +02:00
Alexandre SPANGARO
bee6abd6fc Merge branch '14.0' into 14p24 2021-10-20 07:38:54 +02:00
Alexandre SPANGARO
9685695577 FIX Accountancy - PHP8 2021-10-18 10:19:46 +02:00
Alexandre SPANGARO
dce1e56a78 FIX #18912 Accountancy - SQL error when custom group is added without country defined 2021-10-18 05:44:22 +02:00
Alexandre SPANGARO
9e3a00521d FIX also on customer index for automatic binding 2021-10-13 21:36:04 +02:00
Alexandre SPANGARO
5d7587259d FIX Accountancy - If deposit invoice is used, force binding in deposit accounting account to solve transaction 2021-10-13 21:21:16 +02:00
Alexandre SPANGARO
04091169da Accountancy - Show message for admin if accountancy hidden options are activated to help to resolve some problems 2021-10-13 02:48:42 +02:00
Laurent Destailleur
ff15292b49
Merge pull request #18949 from aspangaro/15a26 
NEW Accountancy - Format FEC/FEC2 - Add column NumFacture
 2021-10-12 15:29:10 +02:00
Laurent Destailleur
34f2b2b68d
Merge branch 'develop' into 15a25 2021-10-12 12:50:30 +02:00
Laurent Destailleur
6168e844bd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2021-10-12 01:43:20 +02:00
Laurent Destailleur
ed3b267d8f Fix css 2021-10-12 01:40:30 +02:00
Alexandre SPANGARO
de98900cb7 NEW Accountancy - Format FEC/FEC2 - Add column NumFacture 2021-10-11 22:00:59 +02:00
Laurent Destailleur
e3045f24cd
Merge pull request #18923 from aspangaro/15a24 
NEW Societe - Add perentity functionality on customer/supplier accountancy auxiliary account
 2021-10-11 15:20:27 +02:00
Alexandre SPANGARO
af8e8077b1 Uniformize 2021-10-11 12:50:16 +02:00
Alexandre SPANGARO
e899d94ed5 NEW Accountancy - rewrite bind accountancy code finding on purchase invoice 2021-10-11 12:50:07 +02:00
Alexandre SPANGARO
c7fd9328cd NEW Societe - Add perentity functionality on customer/supplier accountancy auxiliary account 2021-10-08 06:29:22 +02:00
Alexandre SPANGARO
e68d9dc73c NEW Societe - Add perentity functionality on customer/supplier accountancy auxiliary account 2021-10-07 22:02:56 +02:00
Laurent Destailleur
831c72411b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-10-07 11:35:58 +02:00
Laurent Destailleur
d245abe908 Fix rounding 2021-10-07 11:34:21 +02:00
Laurent Destailleur
162d5d8a39 Fix protection of double party accounting when using situation invoices 2021-10-07 10:38:10 +02:00
Alexandre SPANGARO
adfae30112 NEW Societe - Add perentity functionality on customer/supplier accountancy auxiliary account 2021-10-07 06:18:39 +02:00
Laurent Destailleur
6060f0bfb0 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/admin/productaccount.php
	htdocs/core/class/html.form.class.php
	htdocs/langs/en_US/main.lang
 2021-10-04 14:53:44 +02:00
Laurent Destailleur
4c6f2fc4b5
Merge pull request #18874 from OPEN-DSI/v14-fix-product-per-entity-portability-sql 
FIX Product accountancy affectation with product_perentity activated …
 2021-10-02 21:04:11 +02:00
lvessiller
fd7d1374c2 FIX Product accountancy affectation with product_perentity activated (PR #18620) 2021-10-01 16:37:54 +02:00
Laurent Destailleur
608b6f5fa3 Clean code 2021-09-30 15:24:57 +02:00
Laurent Destailleur
17c89a478c
Merge pull request #17819 from FHenry/dev_new_splitcalc_suggestd_code_compta 
NEW : rewrite bind accountancy code finding on sales invoice
 2021-09-30 14:13:20 +02:00
Laurent Destailleur
e15277bb6c Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-09-28 17:23:07 +02:00
Florian HENRY
d565f9d3f1 reveiw code 2021-09-28 15:09:47 +02:00
Florian HENRY
f47a319c15 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_new_splitcalc_suggestd_code_compta 2021-09-28 15:01:14 +02:00
Laurent Destailleur
37603b451a Fix token in url 2021-09-27 12:24:01 +02:00
Laurent Destailleur
0176ab6057 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/list.php
 2021-09-27 11:40:47 +02:00
Alexandre SPANGARO
4e212054a4 Merge branch '14.0' into 14p16 2021-09-25 07:13:03 +02:00
Alexandre SPANGARO
8f5f657e4d FIX Accountancy - Missing specific filename for export on format FEC2, Ciel & repare it 2021-09-25 07:12:33 +02:00
Laurent Destailleur
00120109fb
Merge pull request #18813 from aspangaro/14p21 
FIX Accountancy - Error on ValidDate for FEC/FEC2 export
 2021-09-24 13:07:17 +02:00
Alexandre SPANGARO
a1bd07d1a3 FIX Accountancy - Error on ValidDate for FEC/FEC2 export 2021-09-24 12:04:25 +02:00
Alexandre SPANGARO
3e485dcb41 FIX Accountancy - Option of export popup are inverted 2021-09-24 06:38:43 +02:00
Alexandre SPANGARO
15313b8d37 FIX Accountancy - Missing specific filename for export on format FEC2 2021-09-24 06:03:01 +02:00
Laurent Destailleur
d38c3028eb Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/expensereport/class/expensereport.class.php
 2021-09-23 02:41:53 +02:00
Laurent Destailleur
dcd3f85e79 Fix sql error 2021-09-21 17:32:08 +02:00
Laurent Destailleur
a7ccbb4d9a css 2021-09-21 15:40:42 +02:00
Laurent Destailleur
841c4da0f8 Fix css 2021-09-21 15:39:05 +02:00
Laurent Destailleur
deb1965cd5 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/card.php
	htdocs/compta/paiement/list.php
	htdocs/core/class/commonobject.class.php
	htdocs/mrp/mo_list.php
	htdocs/projet/tasks/task.php
	htdocs/public/payment/newpayment.php
 2021-09-20 17:15:12 +02:00
Laurent Destailleur
5c8fb38426 Fix add del* action into list of sensitive actions 2021-09-19 14:41:46 +02:00
Laurent Destailleur
d760686239 Fix case of newtoken() 2021-09-18 22:24:00 +02:00
Laurent Destailleur
0749d01c5a Fix add action delete* as sensitive action 2021-09-18 22:04:41 +02:00
Laurent Destailleur
62b721a904 Add deletecontact as sentitive action 
Replace dol_buildpath with DOL_URL_ROOT
 2021-09-18 19:34:46 +02:00
Laurent Destailleur
dff038fddd
Merge pull request #18705 from aspangaro/14p19 
FIX Accountancy - Format Quadra export - Missing line type C to create automaticly a subledger account with label
 2021-09-17 11:56:38 +02:00
Laurent Destailleur
8909702619 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/class/adherent.class.php
	htdocs/bom/class/bom.class.php
	htdocs/filefunc.inc.php
	htdocs/langs/en_US/eventorganization.lang
	htdocs/product/class/productfournisseurprice.class.php
 2021-09-16 13:40:05 +02:00
Alexandre SPANGARO
ed37f9fb7a FIX Accountancy - Some correction on export name 2021-09-16 06:40:43 +02:00
Alexandre SPANGARO
eae4269745 Merge branch '14p19' of https://github.com/aspangaro/dolibarr into 14p19 2021-09-13 21:32:55 +02:00
Alexandre SPANGARO
42543ba005 Add alpha key 2021-09-13 21:29:31 +02:00
stickler-ci
6368ba9a6e Fixing style errors. 2021-09-13 19:21:53 +00:00
Alexandre SPANGARO
44f4f9e288 Merge branch '14.0' into 14p19 2021-09-13 21:13:26 +02:00
Alexandre SPANGARO
fe241cc71f FIX Accountancy - Format Quadra export - Missing line type C (act account) 2021-09-13 21:12:39 +02:00
Alexandre SPANGARO
d7236fad99 Merge branch '14.0' into 14p18 2021-09-13 14:51:17 +02:00
Alexandre SPANGARO
3ee258fefc FIX Accountancy - Trunc code_journal to 2 in format XIMPORT (Ciel, Sage50) 2021-09-13 14:08:41 +02:00
Laurent Destailleur
edb1f31a19 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/customer/index.php
	htdocs/accountancy/expensereport/index.php
	htdocs/accountancy/supplier/index.php
 2021-09-10 20:55:52 +02:00
Laurent Destailleur
fcffcf3858 Remove useless css 2021-09-10 18:54:42 +02:00
Laurent Destailleur
649c618370 CSS 2021-09-10 17:58:41 +02:00
Laurent Destailleur
fe92c2605d Fix look and feel v14 2021-09-10 17:45:27 +02:00
Laurent Destailleur
75cd63a29b Fix css and missing test 2021-09-10 17:39:58 +02:00
Laurent Destailleur
32da715a6c Fix css and missing test 2021-09-10 17:39:08 +02:00
Florian HENRY
e7eb17177d merge 2021-09-10 15:52:54 +02:00
Florian HENRY
865c5d19bf Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_new_splitcalc_suggestd_code_compta 2021-09-10 15:51:36 +02:00
Laurent Destailleur
fa28621709 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/reception/list.php
 2021-09-09 16:11:29 +02:00
Alexandre SPANGARO
6c118b4dfb css 2021-09-08 04:31:38 +02:00
Laurent Destailleur
ee066ad725 Cast sql var 2021-09-03 21:25:43 +02:00
Laurent Destailleur
fb8723d884
Merge pull request #18487 from cfoellmann/PR/fix-remaining-buttons 
replace remaining SubmitCancel buttons
 2021-08-28 18:39:06 +02:00
Laurent Destailleur
29abbbe2fb Clean code 2021-08-28 01:45:53 +02:00
Laurent Destailleur
2dd91bf312 Clean code 2021-08-27 23:36:06 +02:00
Laurent Destailleur
46d993c9a6 Clean code 2021-08-27 22:42:04 +02:00
Laurent Destailleur
2f225ee7e5 Clean code by adding cast int. 2021-08-27 16:33:03 +02:00
Christian Foellmann
f094b4c70c fix up most of the remaining submit inputs 2021-08-24 17:04:17 +02:00
Laurent Destailleur
07ab352877 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/list.php
 2021-08-24 16:37:18 +02:00
Laurent Destailleur
22339a3ed3
Merge pull request #18451 from cfoellmann/PR/form-buttons-function 
improve forms - buttonsSaveCreate()
 2021-08-24 15:26:03 +02:00
Laurent Destailleur
15da97f1da Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/accountancy/journal/expensereportsjournal.php
	htdocs/accountancy/journal/purchasesjournal.php
	htdocs/accountancy/journal/sellsjournal.php
	htdocs/compta/facture/card.php
	htdocs/product/price.php
 2021-08-24 15:05:14 +02:00
Laurent Destailleur
591059847e Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/product/price.php
 2021-08-24 15:00:35 +02:00
Laurent Destailleur
dc006b0ebb Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
 2021-08-23 19:44:02 +02:00
Laurent Destailleur
d4b5ee6c85 Fix cast into variable into sql request. 2021-08-23 17:41:11 +02:00
Alexandre SPANGARO
a0378549b8 FIX Accountancy - Some problems of length with general & subledger account 2021-08-23 15:19:27 +02:00
Christian Foellmann
d706c3b1ec use Forms::buttonsSaveCreate() to generate most of the Save|Cancel forms combination 2021-08-20 14:41:30 +02:00
Laurent Destailleur
9521a9e77f Clean code 2021-08-17 20:02:19 +02:00
Laurent Destailleur
aee291d079
Merge pull request #17865 from ATM-Consulting/NEW_develop_autocomplete_accounting_account_groups 
New develop autocomplete accounting account groups
 2021-08-17 19:46:46 +02:00
Laurent Destailleur
f18f970b08 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-17 13:52:36 +02:00
Laurent Destailleur
cfbe2bf995
Merge pull request #18422 from aspangaro/14p13 
FIX Accountancy - SQL error on select journal on journal
 2021-08-17 02:41:56 +02:00
Laurent Destailleur
352b413a17 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-17 02:12:22 +02:00
Laurent Destailleur
8927eeff50 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-08-17 02:11:36 +02:00
Laurent Destailleur
15020c99e7
Update accountancyexport.class.php 2021-08-17 01:08:18 +02:00
Laurent Destailleur
9b43327af0
Update accountancyexport.class.php 2021-08-17 01:06:26 +02:00
Laurent Destailleur
091166baa7
Update accountancyexport.class.php 2021-08-17 01:03:07 +02:00
Laurent Destailleur
7784c4fcc9
Update bookkeeping.class.php 2021-08-17 00:32:33 +02:00
Alexandre SPANGARO
4b615e541b FIX Accountancy - SQL error when insert a manuel transaction 2021-08-16 21:29:28 +02:00
Alexandre SPANGARO
1bfc0004b1 Better fix 2021-08-16 08:12:24 +02:00
Alexandre SPANGARO
ba12071ea3 FIX Accountancy - SQL error on select journal on journal 2021-08-16 07:57:40 +02:00
Alexandre SPANGARO
b8da594c31 Better fix 2021-08-16 05:47:25 +02:00
Alexandre SPANGARO
abc94a397a FIX #18389 Accountancy - Bug on LDcompta10 export for supplier invoice 2021-08-15 11:12:14 +02:00
Laurent Destailleur
47d57b1ed2 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-08 12:23:44 +02:00
Laurent Destailleur
78e993c9f3 Fix permission to read reports 2021-08-08 12:23:14 +02:00
Laurent Destailleur
ede571dcfe Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2021-08-03 17:08:49 +02:00
Laurent Destailleur
ce5acda635 Fix phpcs 2021-08-03 15:03:41 +02:00
Laurent Destailleur
d0c57dac34 FIx #18217 - Salary - link 'salary' of bank_url not managed 2021-08-03 15:02:09 +02:00
Laurent Destailleur
0058e32207 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-02 19:03:38 +02:00
Laurent Destailleur
eced1c824a Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/accountancy/class/accountancyexport.class.php
	htdocs/core/class/html.form.class.php
	htdocs/projet/tasks/time.php
 2021-08-02 18:47:09 +02:00
Laurent Destailleur
d822421e10 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/accountancy/class/accountancyexport.class.php
	htdocs/accountancy/tpl/export_journal.tpl.php
	htdocs/projet/tasks/time.php
 2021-08-02 18:31:26 +02:00
Laurent Destailleur
e8d385ae42
Merge pull request #18224 from aspangaro/14p9 
FIX: Missing column Date validation in ledger & subledger
 2021-08-01 23:26:25 +02:00
Laurent Destailleur
5256d6e046 css 2021-07-31 17:34:41 +02:00
Laurent Destailleur
6f449cfd6c Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-31 16:33:38 +02:00
Laurent Destailleur
f73394435e Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/expensereport/card.php
	htdocs/societe/list.php
 2021-07-31 16:32:24 +02:00
Florian HENRY
26551909a9 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_new_splitcalc_suggestd_code_compta 2021-07-30 20:27:29 +02:00
Laurent Destailleur
9734fced56
Merge pull request #18221 from aspangaro/14p8 
FIX: Accountancy - Search date on journal
 2021-07-28 19:48:38 +02:00
Alexandre SPANGARO
cd63ede35a Correctif date 2021-07-28 16:46:57 +02:00
Alexandre SPANGARO
7acebd28ca Add information 2021-07-28 14:08:53 +02:00
Alexandre SPANGARO
712f0b897d FIX: Accountancy - Debug Export Sage50 / CIEL Compta / CIEL Compta Evo (Format XIMPORT) 2021-07-28 12:02:45 +02:00
Frédéric FRANCE
42252abc07
remove debug 2021-07-28 10:14:57 +02:00
Alexandre SPANGARO
35862cebfa Fix card presentation 2021-07-26 04:49:56 +02:00
Alexandre SPANGARO
183d413b45 FIX: Accountancy - Rules to delete & modify transaction not applied in ledger & subledger 2021-07-26 04:42:35 +02:00
Alexandre SPANGARO
bbd84fd13e FIX: Missing column Date validation in ledger & subledger 2021-07-26 04:08:05 +02:00
Alexandre SPANGARO
84e5773de8 FIX: Accountancy - Search date on journal 2021-07-25 22:37:20 +02:00
Laurent Destailleur
d9475b8b2b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-08 23:46:35 +02:00
Laurent Destailleur
463fadb776 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/core/class/html.form.class.php
 2021-07-08 23:45:26 +02:00
Laurent Destailleur
8f534b2c20 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-08 22:01:25 +02:00
Alexandre SPANGARO
d6be380816 FIX Accountancy - constant ACCOUNTANCY_USE_PRODUCT_ACCOUNT_ON_THIRDPARTY 2021-07-08 21:58:54 +02:00
Alexandre SPANGARO
cd215cda17 FIX Accountancy - if we define a date start, automatic binding try to solve old binding 2021-07-08 21:49:53 +02:00
Laurent Destailleur
2e33d85b29
Merge pull request #18106 from EpixFr/develop 
NEW : Adding accounting export model for iSuite Expert
 2021-07-08 16:37:11 +02:00
Laurent Destailleur
fe20217bfe
Update accountancyexport.class.php 2021-07-08 16:36:53 +02:00
stickler-ci
335c3029dc Fixing style errors. 2021-07-07 15:55:07 +00:00
EpixFr
edfd40719b Gestion des longueurs des comptes variables 2021-07-07 17:53:10 +02:00
EpixFr
45d36d9134 Ajout export compta iSuite Expert 2021-07-07 17:32:48 +02:00
Alexandre SPANGARO
8bde61c2c6 FIX Accountancy - Link from admin 2021-07-05 06:58:10 +02:00
Laurent Destailleur
b6a538f439
Merge pull request #18056 from aspangaro/14b16 
FIX Accountancy - Clean virtual zero on the import
 2021-06-30 14:44:12 +02:00
Laurent Destailleur
02a5755876 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/langs/nl_NL/main.lang
 2021-06-29 19:59:51 +02:00
Laurent Destailleur
1804c36a05
Merge pull request #18047 from aspangaro/14b16 
Uniformize accounting displays
 2021-06-29 19:24:57 +02:00
Laurent Destailleur
c74060d02c Fix lost change in merge 2021-06-29 19:24:46 +02:00
Laurent Destailleur
d59dfcb08a
Update list.php 2021-06-29 19:21:35 +02:00
Alexandre SPANGARO
52b8044517 FIX Accountancy - Suggested account of product not concerned by account of thirdparty 2021-06-29 04:25:32 +02:00
Laurent Destailleur
11a71d8d2f Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
 2021-06-23 11:41:30 +02:00
Laurent Destailleur
034906a129 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
	htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
 2021-06-23 11:30:44 +02:00
Alexandre SPANGARO
26c5875f97 Uniformize accounting dyiplays 2021-06-22 14:20:08 +02:00
Alexandre SPANGARO
c8326c1365 FIX Accoutancy Limit date payment not register on purchases operations 2021-06-20 21:55:48 +02:00
Laurent Destailleur
f850f058fa Look and feel v14 2021-06-16 21:06:55 +02:00
Laurent Destailleur
b28395dd05
Merge pull request #17942 from aspangaro/14a26 
Look & feel v14
 2021-06-16 11:31:16 +02:00
Alexandre SPANGARO
7f0d2b009e FIX SQL Error on automatic binding with functionality "company per entity" activated 2021-06-16 06:23:50 +02:00
Alexandre SPANGARO
e848579495 Look & feel v14 2021-06-16 06:00:00 +02:00
UT from dolibit
77f0645c0e
Update index.php 2021-06-15 10:30:58 +02:00
Scrutinizer Auto-Fixer
55c9f37ffa Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2021-06-14 13:37:02 +00:00
Laurent Destailleur
5cc86d2319 Fix #yogosha6370 2021-06-14 13:51:09 +02:00
Alexandre SPANGARO
cf723d5120 Look a feel v14 CSS Amount 2021-06-13 06:37:44 +02:00
Alexandre SPANGARO
11959ec1ab Fix some date problems 2021-06-13 06:07:01 +02:00
Alexandre SPANGARO
53d0909a7c Merge remote-tracking branch 'upstream/develop' into 14a26 2021-06-12 14:20:00 +02:00
Alexandre SPANGARO
7444ff5412 Update notified 2021-06-12 14:18:44 +02:00
Laurent Destailleur
73a1119b26 Clean code 2021-06-11 15:21:24 +02:00
Florian HENRY
87276fadf8 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_new_splitcalc_suggestd_code_compta 2021-06-10 16:10:11 +02:00
Laurent Destailleur
fb46ece906 Fix yogosha 6347 2021-06-09 15:36:47 +02:00
Florian HENRY
55761b31c6 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_new_splitcalc_suggestd_code_compta 2021-06-06 22:30:58 +02:00
Florian HENRY
ac6e108be6 fix syntax 2021-06-04 12:27:49 +02:00
Florian HENRY
729ca70bf3 NEW : rewrite bind accountancy code finding on sales invoice 2021-06-04 12:20:52 +02:00
Laurent Destailleur
c3ed30345e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-06-04 11:45:24 +02:00
Laurent Destailleur
8e80d65b7e
Merge pull request #17765 from softwehrler/fix-subledger-label 
Fix label of subaccount
 2021-06-04 11:42:35 +02:00
Florian HENRY
2fdc6d9461 NEW : rewrite bind accountancy code finding on customer invoice 2021-06-04 11:35:12 +02:00
Laurent Destailleur
2586fcd1a3 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/class/commandestats.class.php
	htdocs/core/actions_massactions.inc.php
	htdocs/core/modules/propale/doc/pdf_cyan.modules.php
	htdocs/holiday/month_report.php
	htdocs/product/class/product.class.php
	htdocs/product/stock/class/mouvementstock.class.php
	htdocs/societe/list.php
 2021-06-04 11:20:38 +02:00
Laurent Destailleur
6f1c49abcc Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/accountancy/class/accountancyexport.class.php
	htdocs/commande/class/commandestats.class.php
	htdocs/user/class/usergroup.class.php
 2021-06-04 11:04:18 +02:00
Laurent Destailleur
402d90554a Clean code 2021-06-04 10:04:56 +02:00
Laurent Destailleur
9b0605f979 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-06-04 09:41:35 +02:00
Matthias Haberl
fed5db032a Fix label of subaccount 2021-05-28 11:26:55 +02:00
Florian Mortgat
e6deab5c85 FIX proposed new feature: autocomplete for accounting account groups 2021-05-28 08:42:38 +02:00
Florian Mortgat
c29d5fa747 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_develop_autocomplete_accounting_account_groups 2021-05-28 08:19:55 +02:00
Maxime Kohlhaas
b3a6bcd34f Fix Winfic accountancy export for due date 2021-05-26 15:01:31 +02:00
Maxime Kohlhaas
1d5b8cbb19 Fix Quadra accountancy export for due date 2021-05-26 14:59:28 +02:00
Laurent Destailleur
988660025a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-05-25 20:32:42 +02:00
Laurent Destailleur
a09db63c7b Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/balance.php
	htdocs/contrat/list.php
	htdocs/don/class/api_donations.class.php
	htdocs/societe/class/societe.class.php
 2021-05-25 20:17:54 +02:00
Laurent Destailleur
1b5f7b78b5 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-05-25 20:12:34 +02:00
Laurent Destailleur
2cb8401921
Merge pull request #17695 from aspangaro/14b10 
NEW Add hook on balance list
 2021-05-25 19:38:24 +02:00
Laurent Destailleur
6d637bf1e1
Merge pull request #17707 from FHenry/12_fix_export_balance 
fix: export balance with double quote
 2021-05-25 19:36:57 +02:00
Laurent Destailleur
d18fc6ca3c Fix init 2021-05-25 15:38:12 +02:00
Florian HENRY
7d223beae5 fix: export balance with doublequote 2021-05-24 12:51:58 +02:00
Alexandre SPANGARO
ac9d9e9314 NEW Add hook on balance list 2021-05-21 07:04:58 +02:00
Florian Mortgat
8eb8889b17 NEW: autocomplete account group when editing an account card 2021-05-19 11:12:34 +02:00
Laurent Destailleur
dd00feae00 Clean code 2021-05-12 08:57:06 +02:00
Laurent Destailleur
aa05788d62 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/compta/bank/class/account.class.php
	htdocs/core/class/extrafields.class.php
	htdocs/core/lib/security.lib.php
	htdocs/core/modules/societe/mod_codeclient_elephant.php
	htdocs/filefunc.inc.php
	test/phpunit/CodingPhpTest.php
 2021-05-11 20:34:46 +02:00
ksar
107374748e
FIX #13955 2021-05-10 15:42:24 +02:00
Laurent Destailleur
03e8f2aee1 Fix for performance troubles 2021-05-03 18:49:37 +02:00
Laurent Destailleur
28b1d83ae9 Make some performance enhancements 2021-05-03 18:29:21 +02:00
Laurent Destailleur
49a0304071 Add TODO 2021-05-03 16:48:40 +02:00
Laurent Destailleur
6ef463f688 Code comment 2021-05-03 13:54:26 +02:00
Laurent Destailleur
42c2fb5736 Fix sql error on new filter 2021-05-03 13:47:26 +02:00
Laurent Destailleur
1c61d2df9f
Merge pull request #17455 from aspangaro/14a42 
NEW Accountancy - Possibility to select journals in balance
 2021-05-03 13:36:08 +02:00
Laurent Destailleur
a806a18455 Reduce sql 2021-05-03 13:35:10 +02:00
Laurent Destailleur
097ccdab9f
Merge pull request #17454 from aspangaro/14a30 
NEW Accountancy - Add select date from/to in binding page
 2021-05-03 13:19:12 +02:00
Laurent Destailleur
e9ed985e18 Fix filter 2021-05-03 12:47:40 +02:00
Laurent Destailleur
39e27b6f38 Minor perf enhancement 2021-05-03 12:32:31 +02:00
Laurent Destailleur
d7e445efbd Better doc 2021-05-03 12:01:26 +02:00
Laurent Destailleur
9c0d4dd86b Small performance enhancement for transfer in accountancy. 2021-05-03 11:31:16 +02:00
Laurent Destailleur
2a47128e2d Code comment 2021-05-03 11:00:41 +02:00
Alexandre SPANGARO
8eddc75a22 Remove duplicate variable 2021-05-02 02:49:53 +02:00
Alexandre SPANGARO
cd6bcd14f3 NEW Accountancy - Possibility to select journals in balance 2021-05-02 02:35:16 +02:00
Alexandre SPANGARO
6b75edf2f3 NEW Accountancy - Add select date from/to in binding supplier list 2021-05-02 02:03:19 +02:00
Alexandre SPANGARO
87b9f7a77d NEW Accountancy - Add select date from/to in already bind supplier list 2021-05-02 01:59:11 +02:00
Alexandre SPANGARO
3c01eba11a NEW Accountancy - Add select date from/to in already bind customer list 2021-05-02 01:53:49 +02:00
Alexandre SPANGARO
0acbd87a53 NEW Accountancy - Add select date from/to in binding customer list 2021-05-02 01:47:29 +02:00
Laurent Destailleur
75a8dc28ea
Merge pull request #17261 from aspangaro/14a39 
Maxi debug of societe/product per entity
 2021-04-28 17:06:45 +02:00
Laurent Destailleur
d6cdfcdd8c Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/paiement/card.php
	htdocs/compta/paiement/class/paiement.class.php
	htdocs/public/members/new.php
 2021-04-27 02:07:48 +02:00
Alexandre SPANGARO
d95be3e08b Merge remote-tracking branch 'upstream/develop' into 14a39 2021-04-26 13:53:16 +02:00
Laurent Destailleur
fd2d317b4a Fix #yogosha5881 2021-04-25 15:55:36 +02:00
Laurent Destailleur
42938ffe31 FIX #yogosha5879 2021-04-24 21:15:09 +02:00
Laurent Destailleur
d0cc64479d Fix protect sql 2021-04-24 20:18:11 +02:00
Alexandre SPANGARO
1729497d62 FIX Accountancy - Quadra export - wrong data on credit 2021-04-20 13:56:58 +02:00
Alexandre SPANGARO
d27030df3f Merge remote-tracking branch 'upstream/develop' into 14a39 2021-04-20 04:43:14 +02:00
Laurent Destailleur
ea97992c3d css 2021-04-19 22:52:13 +02:00
Laurent Destailleur
e71e5d533d Fix HTML5 2021-04-19 21:30:25 +02:00
Laurent Destailleur
4d916f3c9f Fix perm 2021-04-19 17:23:16 +02:00
Alexandre SPANGARO
305b338a11 Update notified 2021-04-19 06:03:03 +02:00
Alexandre SPANGARO
510f387a80 Merge remote-tracking branch 'upstream/develop' into 14a26 2021-04-18 07:49:48 +02:00
Anthony Berton
a612831e28 next_change 2021-04-14 14:45:55 +02:00
Alexandre SPANGARO
2f31720896 Maxi debug of societe/product per entity 2021-04-14 04:45:17 +02:00
Laurent Destailleur
358bb87ae2 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/index.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/payments.lib.php
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/core/modules/facture/doc/pdf_sponge.modules.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
	htdocs/core/modules/propale/doc/pdf_cyan.modules.php
	htdocs/projet/card.php
	htdocs/public/payment/newpayment.php
	htdocs/societe/list.php
	htdocs/ticket/document.php
 2021-04-13 20:19:05 +02:00
Laurent Destailleur
3439bc4a0f Clean code 2021-04-13 11:30:23 +02:00
Laurent Destailleur
9e491ad30c Add comment 2021-04-13 10:18:23 +02:00
Laurent Destailleur
7004747ca3 Add more tooltips on edition of accounting account 
Fix setup of accountancy

Conflicts:
	htdocs/accountancy/admin/account.php
 2021-04-13 09:51:17 +02:00
Laurent Destailleur
243fcb38ba Add more tooltips on edition of accounting account 
Fix setup of accountancy
 2021-04-13 09:46:50 +02:00
Laurent Destailleur
8a62d97b89 Remove one thousand of useless files 2021-04-12 15:57:16 +02:00
Laurent Destailleur
46031dc39e Fix missing column 2021-04-11 13:53:36 +02:00
Laurent Destailleur
fa231d85c9 Fix sql 2021-04-11 13:48:49 +02:00
Alexandre SPANGARO
451164ba64 Merge remote-tracking branch 'upstream/develop' into 14a26 2021-04-10 21:44:23 +02:00
Laurent Destailleur
3f119c8004 Fix eol 2021-04-08 01:43:38 +02:00
Laurent Destailleur
2816677d94 Fix css 2021-04-07 01:09:23 +02:00
Laurent Destailleur
baf3cbdd6f
Merge pull request #17096 from Hystepik/develo#2 
Close #17073 : Add of select line for mass deletion of chart of account lines
 2021-04-06 19:46:46 +02:00
Laurent Destailleur
ab2231c9cf
Update account.php 2021-04-06 19:44:31 +02:00
Laurent Destailleur
adbe832826
Update bookkeeping.class.php 2021-04-06 19:02:17 +02:00
Alexandre SPANGARO
241b0d3f63 Merge remote-tracking branch 'upstream/develop' into 14a32 2021-04-06 10:13:13 +02:00
lmarcouiller
3f70904398 changes to match eldy advices 2021-04-06 09:42:05 +02:00
Laurent Destailleur
95de241245 FIx #yogosha5774 2021-04-05 15:21:17 +02:00
Laurent Destailleur
01eec2b919 FIx #yogosha5774 2021-04-05 15:11:28 +02:00
Laurent Destailleur
5769701cd0 Better example 2021-04-05 15:05:21 +02:00
Alexandre SPANGARO
a50ca93a3e FIX: Accountancy - Warning on the pages of the preparatory statements of accounting entries 2021-04-04 16:34:17 +02:00
Alexandre SPANGARO
9e8ed661b3 FIX: Accountancy - Warning on the pages of the preparatory statements of accounting entries 2021-04-04 08:06:59 +02:00
Alexandre SPANGARO
025304ad6d Accountancy - Add a constant to enable fk_docdet register 2021-04-04 07:12:01 +02:00
lmarcouiller
369994fa92 Fix #17073 : Add of select line and mass delete 2021-04-03 10:12:05 +02:00
Laurent Destailleur
bb8ec90b79 Fix css 2021-04-02 02:50:07 +02:00
Laurent Destailleur
55741506c8
Merge pull request #17053 from aspangaro/14a30 
NEW: Accountancy - Add FEC import
 2021-03-31 22:15:26 +02:00
stickler-ci
416a09672f Fixing style errors. 2021-03-31 18:43:09 +00:00
Alexandre SPANGARO
dd913b2385 Update 2021-03-31 20:40:26 +02:00
Laurent Destailleur
2af8b7078c Fix turnover calculation was wrong. We must include only 2021-03-31 19:50:43 +02:00
Laurent Destailleur
2e3af575be Look and feel v14 2021-03-31 18:12:26 +02:00
Laurent Destailleur
27bc05a039 Debug report accountancy 2021-03-31 17:59:42 +02:00
Alexandre SPANGARO
9b65529fc7 NEW: Accountancy - Add FEC import 2021-03-31 04:59:12 +02:00
Alexandre SPANGARO
5723dbb836 FIX: Add a sub table to manage accountancy on product/company 2021-03-31 04:52:24 +02:00
Alexandre SPANGARO
38d47c184e FIX: Add a sub table to manage accountancy on product/company 2021-03-30 22:12:57 +02:00
Alexandre SPANGARO
4e30481fa2 Merge remote-tracking branch 'upstream/develop' into 14a27 2021-03-30 22:05:03 +02:00
Laurent Destailleur
3744bc6a7a FIX #yogosha5746 - next step (work in progress) 2021-03-30 18:17:13 +02:00
Laurent Destailleur
6e422d26f3 FIX #yogosha5746 - next step (wip) 2021-03-30 16:20:18 +02:00
Laurent Destailleur
fb84608586 Clean sql 2021-03-30 03:37:54 +02:00
Alexandre SPANGARO
ea6b22f06e FIX: Add a sub table to manage accountancy on product/company 2021-03-30 03:27:46 +02:00
Laurent Destailleur
843e0a2c39 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/card.php
	htdocs/core/class/html.formother.class.php
	htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
	htdocs/projet/tasks/time.php
	htdocs/webservices/server_thirdparty.php
 2021-03-29 21:47:31 +02:00
Laurent Destailleur
2689bc938d Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-03-29 21:40:01 +02:00
Laurent Destailleur
f4ae8af9ea Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/accountancy/bookkeeping/listbyaccount.php
	htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
 2021-03-29 21:39:53 +02:00
Laurent Destailleur
6057d8aabd Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/tpl/login.tpl.php
 2021-03-29 21:37:21 +02:00
Laurent Destailleur
8c08b3945b Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2021-03-29 21:35:46 +02:00
Alexandre SPANGARO
3c70a3d06c Move to _PERENTITY 2021-03-27 07:25:31 +01:00
Alexandre SPANGARO
56ae51375d FIX Search on date in accountancy 2021-03-27 07:11:28 +01:00
Alexandre SPANGARO
1382323f77 FIX Start hour on ACCOUNTING_DATE_START_BINDING 2021-03-27 06:56:34 +01:00
Alexandre SPANGARO
22f809c517 Move to _PERENTITY 2021-03-27 05:23:20 +01:00
Alexandre SPANGARO
6422b0a6c0 Merge remote-tracking branch 'upstream/develop' into 14a27 2021-03-27 05:02:55 +01:00
Laurent Destailleur
992e2e0825 Show None if no account found. 2021-03-26 12:27:23 +01:00
Laurent Destailleur
a5034d44f7 $_POST war 2021-03-24 19:53:31 +01:00
Alexandre SPANGARO
49faedae6f Work on date_validation 2021-03-24 11:56:23 +01:00
Laurent Destailleur
b275789223 Fix regression 2021-03-23 12:22:30 +01:00
Laurent Destailleur
6a0e0f4c06 Fix #ygosha5698 2021-03-22 12:10:51 +01:00
Laurent Destailleur
15440917b1 Fix #ygosha5698 2021-03-22 11:30:18 +01:00
stickler-ci
5af4b4673c Fixing style errors. 2021-03-21 22:12:36 +00:00
Alexandre SPANGARO
0c2ada4299 Merge remote-tracking branch 'upstream/develop' into 14a27 2021-03-21 23:08:01 +01:00
Laurent Destailleur
976b61456a
Merge pull request #16824 from dolibit-ut/patch-117 
Update fiscalyear_info.php
 2021-03-20 11:57:34 +01:00
Laurent Destailleur
139cd5e8b7
Merge pull request #16823 from dolibit-ut/patch-116 
Update fiscalyear_card.php
 2021-03-20 11:57:24 +01:00
Laurent Destailleur
1230c99629
Merge pull request #16822 from dolibit-ut/patch-115 
Update fiscalyear.php
 2021-03-20 11:53:01 +01:00
Alexandre SPANGARO
17d3b85ec4 Merge remote-tracking branch 'upstream/develop' into 14a27 2021-03-20 07:47:54 +01:00
Alexandre SPANGARO
00e21caa42 NEW: Add a sub table to manage accountancy on product/company 2021-03-20 07:42:16 +01:00
Laurent Destailleur
d83d005284 FIX #yogosha5674 2021-03-19 12:44:59 +01:00
UT from dolibit
a0feed2517
Update fiscalyear_info.php 
$help_url = "EN:Module_Double_Entry_Accounting";

llxHeader('', $title, $help_url);
 2021-03-19 09:08:55 +01:00
UT from dolibit
19f7b10e4f
Update fiscalyear_card.php 
$help_url = "EN:Module_Double_Entry_Accounting";

llxHeader('', $title, $help_url);
 2021-03-19 09:07:27 +01:00
UT from dolibit
6713d9b099
Update fiscalyear.php 
$help_url = "EN:Module_Double_Entry_Accounting";

llxHeader('', $title, $help_url);
 2021-03-19 09:05:49 +01:00
Laurent Destailleur
9a5d1acc1d
Merge pull request #16769 from frederic34/patch-4 
fix php8 warning
 2021-03-18 23:20:43 +01:00
Laurent Destailleur
99f95741d1
Merge pull request #16781 from frederic34/patch-12 
fix php8 warning
 2021-03-18 23:09:22 +01:00
UT from dolibit
569d33392d
Update card.php 
change  $helpurl  -> $help_url

$help_url = 'EN:Category:Accounting';
 2021-03-18 21:49:29 +01:00
Alexandre SPANGARO
18d247026d NEW: Add a sub table to manage product/societe 2021-03-18 17:08:55 +01:00
Laurent Destailleur
46972ec669 FIx #5660 2021-03-18 14:34:44 +01:00
Frédéric FRANCE
f9e1624a78
fix php8 warning 2021-03-17 22:41:18 +01:00
Frédéric FRANCE
340f67fce8
fix php8 warning 2021-03-17 18:23:44 +01:00
Frédéric FRANCE
7b8d1abfcf
fix php8 warnings 2021-03-16 18:04:51 +01:00
Laurent Destailleur
e366d2c379 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/admin/tools/export_files.php
	htdocs/compta/paiement_charge.php
	htdocs/compta/sociales/card.php
	htdocs/core/lib/functions.lib.php
	htdocs/cron/list.php
	htdocs/filefunc.inc.php
	test/phpunit/FilesLibTest.php
 2021-03-16 14:57:04 +01:00
Alexandre SPANGARO
03481a0197 Uniformize translation 2021-03-16 04:22:43 +01:00
Laurent Destailleur
765fdff871
Merge pull request #16689 from dolibit-ut/patch-74 
Update thirdparty_lettering_supplier.php
 2021-03-15 17:17:21 +01:00
UT from dolibit
4923bb3577
Update thirdparty_lettering_supplier.php 
-> $help_url add 'DE:Modul_Geschäftspartner'
 2021-03-15 15:40:58 +01:00
UT from dolibit
15f9d07d57
Update thirdparty_lettering_customer.php 
-> $help_url    add   'DE:Modul_Geschäftspartner'
 2021-03-15 15:36:08 +01:00
Frédéric FRANCE
11afb74bae
fix php8 warning 2021-03-14 18:04:51 +01:00
Laurent Destailleur
cc10106a21 Fix protection on int 2021-03-14 12:20:23 +01:00
Laurent Destailleur
12f50a76d7 Fix yogosha #5627 2021-03-14 11:48:39 +01:00
Laurent Destailleur
6a5d3bdec2
Merge pull request #16602 from fmarcet/13.0 
FIX: Buttons to disable bindings not working
 2021-03-11 16:05:12 +01:00
Laurent Destailleur
9ed128c6fa Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/admin/account.php
	htdocs/core/class/html.formaccounting.class.php
	htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
	htdocs/langs/en_US/errors.lang
	htdocs/product/card.php
 2021-03-10 15:35:09 +01:00
Laurent Destailleur
a0c7c6bad9 Fix selection of accounting account 2021-03-10 10:45:01 +01:00
Ferran Marcet
1dae21e608 FIX: Buttons to disable bindings not working 2021-03-09 18:44:06 +01:00
Laurent Destailleur
c0e0300eb3 Enhance the page security 2021-03-08 11:08:58 +01:00
Laurent Destailleur
7d20df8054
Merge pull request #16177 from atm-gauthier/NEW/add_real_payments_on_salaries 
NEW Salary payment request and Salary payment are 2 different steps in workflow on Salary payment recording
 2021-03-04 16:53:54 +01:00
Gauthier PC portable 024
6da28f5e44 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries 2021-03-01 11:12:03 +01:00
Frédéric FRANCE
1b046f25cf
add new rule 2021-03-01 00:19:52 +01:00
Laurent Destailleur
9cf4222d3a Look and feel v14 2021-02-27 17:15:40 +01:00
Laurent Destailleur
c1a75d7b70 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-26 19:39:17 +01:00
Laurent Destailleur
e7da1d7fe4 FIX #16431 2021-02-26 19:38:18 +01:00
Laurent Destailleur
dd72a52e8f Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/balancebymonth.php
	htdocs/accountancy/class/accountancyexport.class.php
 2021-02-26 19:23:23 +01:00
Laurent Destailleur
d5566dbf8f FIX #16431 2021-02-26 19:18:03 +01:00
Gauthier PC portable 024
c0160a5f3b Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries 2021-02-23 15:20:15 +01:00
Gauthier PC portable 024
4f767c0823 Merge branch 'NEW/12.0_new_payments_on_salaries' of github.com:ATM-Consulting/dolibarr into NEW/add_real_payments_on_salaries 2021-02-23 15:18:44 +01:00
Gauthier PC portable 024
a767bffc3a FIX : correction of payment salaries list on employee tab of user card 2021-02-23 15:08:27 +01:00
Frédéric FRANCE
337689d5d2
code syntax 2021-02-22 21:36:42 +01:00
Laurent Destailleur
f6080d45fa Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-22 16:21:26 +01:00
Laurent Destailleur
7fd2ac6618 Fix link to show line in pending account 2021-02-22 16:20:13 +01:00
Gauthier PC portable 024
134d7e00ec Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries 2021-02-17 16:56:50 +01:00
Laurent Destailleur
be3703a05b Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
 2021-02-15 16:46:55 +01:00
Laurent Destailleur
f0e234c874 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/compta/bank/various_payment/list.php
 2021-02-15 16:45:17 +01:00
Alexandre SPANGARO
83f9451b43 FIX: Accountancy - Fix some problems on CEGID export 2021-02-11 13:17:20 +01:00
Gauthier PC portable 024
df8ca1ef84 Merge branch '12.0_new_payments_on_salaries' of github.com:atm-gauthier/dolibarr into NEW/add_real_payments_on_salaries 2021-02-05 09:29:20 +01:00
Gauthier PC portable 024
e188ec6cd7 NEW : add real payments on salaries objects 2021-02-04 17:21:08 +01:00
Laurent Destailleur
b24aac1e6b Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/commande/list.php
 2021-01-31 12:03:39 +01:00
Laurent Destailleur
215752a93c Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-01-30 14:04:14 +01:00
Alexandre SPANGARO
413fc95f9a FIX: Accountancy - label_operation is used instead of label_compte 2021-01-28 23:40:15 +01:00
Laurent Destailleur
a4c0459c1e Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/user/list.php
 2021-01-27 21:09:01 +01:00
Alexandre SPANGARO
7670a4f76c Missing file language & uniformize 2021-01-26 04:46:09 +01:00
Laurent Destailleur
33903cb5c7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-24 15:30:10 +01:00
Laurent Destailleur
0f5fc7353e Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/admin/index.php
	htdocs/admin/mailing.php
	htdocs/admin/paymentbybanktransfer.php
	htdocs/admin/prelevement.php
	htdocs/modulebuilder/template/admin/setup.php
 2021-01-24 15:29:53 +01:00
Laurent Destailleur
8bbf6ce577
Merge pull request #16045 from aspangaro/13a30 
FIX: Accountancy - Search_not_reconciled
 2021-01-24 15:20:58 +01:00
Frédéric FRANCE
5820758968
fix class name Tva 2021-01-23 20:59:23 +01:00
Laurent Destailleur
452aea1d8b Fix bad test 2021-01-23 17:59:56 +01:00
Laurent Destailleur
dd69aed27b Fix error test 2021-01-23 17:49:08 +01:00
Laurent Destailleur
6d0cbd3ee5 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-23 17:32:49 +01:00
Laurent Destailleur
f2c4e25827 Clean code 2021-01-23 17:32:14 +01:00
Alexandre SPANGARO
77a43c51f9 FIX: Accountancy - Search_not_reconciled 2021-01-22 15:10:23 +01:00
Laurent Destailleur
e1b6f33894 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/contact/card.php
	htdocs/contact/class/contact.class.php
	htdocs/langs/fr_FR/stocks.lang
	htdocs/modulebuilder/template/myobject_list.php
 2021-01-22 13:40:00 +01:00
Alexandre SPANGARO
0598656be7 FIX: Accountancy - Search_not_reconciled 2021-01-21 21:23:31 +01:00
Alexandre SPANGARO
939f27deed Accountancy - Gestimum v3 / v5 Added a sort to excluse line at zero 2021-01-21 20:55:46 +01:00
Laurent Destailleur
8076d47b8a FIX #15980 2021-01-21 19:08:03 +01:00
Laurent Destailleur
0f7bdef1c1 FIX in pages of balances 2021-01-21 18:02:17 +01:00
Laurent Destailleur
69e0973c72 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-17 12:50:12 +01:00
Laurent Destailleur
47b90ab400 Fix duplicate log 2021-01-17 12:49:37 +01:00
Laurent Destailleur
cdab7041c4 Fix duplicate log 2021-01-17 12:49:01 +01:00
Laurent Destailleur
3cec156158 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-17 12:22:10 +01:00
Laurent Destailleur
e3335b5b2c Fix bad class 2021-01-17 12:21:27 +01:00
Laurent Destailleur
05f0576b24 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-17 12:18:11 +01:00
Laurent Destailleur
d16e221087 Fix popup 2021-01-17 12:16:56 +01:00
Laurent Destailleur
e7a77525ca Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-17 12:02:42 +01:00
Laurent Destailleur
10ee98c452 Fix tooltip 2021-01-17 12:02:15 +01:00
Laurent Destailleur
1fe6eccb1c css 2021-01-17 11:46:41 +01:00
Laurent Destailleur
bb6ea8a6cb
Merge pull request #15984 from frederic34/patch-14 
fix merge
 2021-01-16 17:00:12 +01:00
Laurent Destailleur
6d455352a3 Restore change for test 2021-01-15 17:47:39 +01:00
Laurent Destailleur
32bd194f8e Sort array 2021-01-15 17:47:14 +01:00
Laurent Destailleur
8cef8df33a Hide advanced feature with ACCOUNTANCY_USE_PRODUCT_ACCOUNT_ON_THIRDPARTY 2021-01-15 17:35:16 +01:00
Laurent Destailleur
2970dc2151 Fix warning 2021-01-15 15:14:23 +01:00
Laurent Destailleur
ba37396af2 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-15 14:36:32 +01:00
Laurent Destailleur
82cedd9fd2 Fix filter 2021-01-15 14:36:02 +01:00
Laurent Destailleur
a16fa64596 Fix merge 2021-01-15 11:42:54 +01:00
Frédéric FRANCE
4f67f840bf
fix merge 2021-01-14 14:48:41 +01:00
Laurent Destailleur
aaddda9a6e Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/list.php
	htdocs/accountancy/bookkeeping/listbysubaccount.php
	htdocs/accountancy/class/accountancyexport.class.php
	htdocs/user/class/usergroup.class.php
 2021-01-14 14:13:08 +01:00
Laurent Destailleur
d76aab4d08 Clean code and comment to have code easier to undestand. 2021-01-14 10:56:24 +01:00
Laurent Destailleur
77a094007f Fix parm to url to switch between screen 
Fix error message
Make position of columns more friendly
 2021-01-14 10:34:32 +01:00
Alexandre SPANGARO
dae1794e3d FIX: Accountancy - Export Gestinum_v3 use facnumber for customer invoice 2021-01-13 11:08:33 +01:00
Laurent Destailleur
a72b33367a
Merge pull request #15957 from aspangaro/13b8 
FIX: Accountancy - Piece is a required field for FEC compatibility
 2021-01-12 20:57:20 +01:00
Florian HENRY
d856b0149d Merge branch '13_backport' into develop 2021-01-12 10:08:12 +01:00
Alexandre SPANGARO
19ac498f4e FIX: Accountancy - Piece is a required field for FEC compatibility 2021-01-12 06:03:57 +01:00
Alexandre SPANGARO
5d6ca5c636 FIX: Accountancy - Add translation when journal label data is record 2021-01-12 05:52:47 +01:00
Alexandre SPANGARO
20fba8f4d2 FIX : Accountancy - FEC Export - Add trans & unaccent on journal label 2021-01-12 05:46:24 +01:00
Laurent Destailleur
8a3a59dfca
Merge pull request #15636 from aspangaro/14a5 
NEW: Accountancy - Introduce "Level3" - Define account directly in thirdparty
 2021-01-11 17:10:03 +01:00
Laurent Destailleur
88fdf0491f
Merge pull request #15943 from aspangaro/13b6 
FIX: Hidden accountancy export button without any right
 2021-01-11 16:07:55 +01:00
stickler-ci
7339217cf1 Fixing style errors. 2021-01-11 08:51:52 +00:00
Alexandre SPANGARO
c40976e4f9 FIX: Hidden accountancy export button without any right 2021-01-11 09:47:59 +01:00
Laurent Destailleur
f411b29b28 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/listbysubaccount.php
	htdocs/langs/en_US/main.lang
	htdocs/langs/fr_FR/accountancy.lang
 2021-01-09 02:34:43 +01:00
Alexandre SPANGARO
5606542220 FIX: Accountancy - Add control on required fields when we create an account 2021-01-07 06:59:40 +01:00
Alexandre SPANGARO
74ba7e68da Mix two systems for create and edit account from balance 2021-01-07 06:27:36 +01:00
Alexandre SPANGARO
4077565de9 Merge branch '13.0' into 13b5 2021-01-07 05:27:43 +01:00
Laurent Destailleur
aa05370566 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-06 21:34:36 +01:00
Laurent Destailleur
ce035eb4ce Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/bom/bom_card.php
 2021-01-06 21:33:59 +01:00
Laurent Destailleur
1aa7e4adeb Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-01-06 21:32:46 +01:00
atm-lena
4b9bb824d0 FIX balance starting and ending fiscal month #14197 2021-01-06 11:16:51 +01:00
Frédéric FRANCE
58a4249222
clean code 2021-01-05 20:21:15 +01:00
Frédéric FRANCE
76d46652b7
doxygen 2021-01-05 20:17:26 +01:00
Alexandre SPANGARO
99949c4817 Merge remote-tracking branch 'upstream/develop' into 14a5 2021-01-03 11:46:20 +01:00
Alexandre SPANGARO
691e8580cd Add date_export on new ledger & subledger to show edit or delete link when is not export yet 2021-01-03 05:44:07 +01:00
Alexandre SPANGARO
1d5089e95e Repare link to create unknown account 2021-01-03 04:42:21 +01:00
Alexandre SPANGARO
1ebb018903 Add language file 2021-01-03 04:11:25 +01:00
Laurent Destailleur
1ab459e854 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-02 16:19:08 +01:00
Alexandre SPANGARO
2727fd70b7 FIX: Accountancy - Debug experimental function to validate movements 2021-01-02 14:00:24 +01:00
Laurent Destailleur
b93c3676d0
Merge pull request #15339 from aspangaro/14a3 
Dev multifilter journal on ledger (complete)
 2020-12-30 23:59:02 +01:00
Laurent Destailleur
bdb261b803
Merge pull request #15840 from frederic34/accountancyadminindex 
remove whitespace
 2020-12-30 23:53:17 +01:00
Laurent Destailleur
020caf8809 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-12-30 23:52:36 +01:00
Laurent Destailleur
e17d4b8220 Fix total when no data 2020-12-30 23:51:55 +01:00
Laurent Destailleur
1eb8833356 Fix total when no data 2020-12-30 23:39:51 +01:00
Frédéric FRANCE
9916335d93
remove whitespace 2020-12-30 19:17:28 +01:00
Laurent Destailleur
92a88441ac
Merge pull request #15328 from FHenry/dev_multifilter_jounal_on_bookeping 
Dev multifilter jounal on bookeping
 2020-12-30 13:19:27 +01:00
Laurent Destailleur
e5da047134
Update index.php 2020-12-30 13:16:38 +01:00
Laurent Destailleur
1d90717fea
Merge branch '13.0' into paymentsalary 2020-12-30 12:45:57 +01:00
Laurent Destailleur
057ed201a7 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/accountancy/bookkeeping/balance.php
 2020-12-30 12:08:12 +01:00
Alexandre SPANGARO
a843d7fac3 Merge remote-tracking branch 'upstream/develop' into 14a5 2020-12-29 21:10:25 +01:00
Alexandre SPANGARO
2932e2f804 NEW: Accountancy - Add formconfirm with options on export 2020-12-29 04:33:47 +01:00
Alexandre SPANGARO
5001cfce71 NEW: Accountancy - Format FEC - Add new field DateLimitReglmt 2020-12-28 04:12:23 +01:00
Alexandre SPANGARO
abdb3a3f03 Merge remote-tracking branch 'upstream/develop' into 14a3 2020-12-28 03:49:01 +01:00
Alexandre SPANGARO
9eaeab1208 Merge remote-tracking branch 'upstream/develop' into 14a5 2020-12-28 03:30:41 +01:00
Alexandre SPANGARO
26791714ce Fix : Introduce constant ACCOUNTANCY_SHOW_OPENING_BALANCE 2020-12-28 03:07:33 +01:00
Laurent Destailleur
4a8e72c997 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/ecm/file_card.php
 2020-12-27 21:00:07 +01:00
Laurent Destailleur
81ab33ff12 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/accountancy/bookkeeping/balance.php
	htdocs/product/list.php
 2020-12-27 19:40:03 +01:00
Laurent Destailleur
895f59b9a7
Merge pull request #15765 from aspangaro/13b4 
NEW: Accountancy - In ledger & journals, show link on bank transaction
 2020-12-27 14:34:59 +01:00
Florian HENRY
77c335c5f3 fix colspan balance accountanty 2020-12-23 09:19:56 +01:00
Alexandre SPANGARO
f273273129 FIX: Accountancy - Retire entire opening balance feature 2020-12-22 06:57:55 +01:00
Laurent Destailleur
1d6e2a01a6
Merge pull request #15762 from aspangaro/13b1 
FIX: Accountancy - Quadra export format - Manage negative amount
 2020-12-16 15:24:14 +01:00
Laurent Destailleur
ef70bdc307
Merge pull request #15764 from aspangaro/13b3 
FIX: Accountancy - Reconciled options not working on ledger et subaccount ledger + CSS
 2020-12-16 15:23:14 +01:00
Alexandre SPANGARO
c5ee976c7e NEW: Accountancy - In ledger & journals, show link on bank transaction 2020-12-16 06:38:17 +01:00
Alexandre SPANGARO
b01a9d6cc3 FIX: Accountancy - Reconciled options not working on ledger et subaccount ledger 2020-12-16 05:32:36 +01:00
Alexandre SPANGARO
ca40d5e52a NEW: Accountancy - Introduce FEC "2" Format to resolve conflict with some software 2020-12-16 05:16:08 +01:00
Alexandre SPANGARO
a03de433be FIX: Accountancy - Quadra export format - Manage negative amount 2020-12-16 05:03:37 +01:00
Alexandre SPANGARO
ca6b8176e9 Merge remote-tracking branch 'upstream/develop' into 13b1 2020-12-16 04:32:26 +01:00
Laurent Destailleur
cee63335a2 FIX #15754 Mor complete PR 2020-12-15 13:38:21 +01:00
Alexandre SPANGARO
5ec7b01fb4 FIX: Link to subaccount ledger 2020-12-15 09:34:46 +01:00
Alexandre SPANGARO
31e5709e0b Revert "FIX: Link to subaccount ledger" 
This reverts commit 64fa2120b2.
 2020-12-15 09:32:54 +01:00
Alexandre SPANGARO
64fa2120b2 FIX: Link to subaccount ledger 2020-12-15 08:40:14 +01:00
Alexandre SPANGARO
593f5bcb7a Merge remote-tracking branch 'upstream/develop' into 14a5 2020-12-15 06:50:22 +01:00
Laurent Destailleur
acb73966f7 Clean code. Removed phpexcel library. 2020-12-13 16:27:44 +01:00
Laurent Destailleur
4f79fdb4ab Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-12-13 15:07:25 +01:00
Laurent Destailleur
7886a6e838 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-12-13 15:06:54 +01:00
Alexandre SPANGARO
35b3d4f40a FIX: Export FEC - Force Carriage Return Line Feed 2020-12-13 14:11:04 +01:00
Laurent Destailleur
be249538ee Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/class/accountancyexport.class.php
 2020-12-08 18:17:02 +01:00
Laurent Destailleur
34e7943d09 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/fourn/class/paiementfourn.class.php
 2020-12-08 18:14:56 +01:00
Laurent Destailleur
4e72543fde Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/accountancy/class/accountancyexport.class.php
	htdocs/fourn/class/paiementfourn.class.php
	htdocs/fourn/paiement/card.php
 2020-12-08 18:11:39 +01:00
Alexandre SPANGARO
54fad02936 Fix PR 2020-12-08 13:55:51 +01:00
Alexandre SPANGARO
78dc1eaa83 Merge remote-tracking branch 'upstream/develop' into 14a5 2020-12-08 13:51:01 +01:00
Alexandre SPANGARO
7c77a0d84b FIX : Export FEC - Remove line at zero 2020-12-07 23:53:09 +01:00
Laurent Destailleur
995afd59f2
Merge pull request #15672 from frederic34/patch-8 
fix trans replace html
 2020-12-07 22:35:01 +01:00
Laurent Destailleur
2c094fe847
Merge pull request #15673 from frederic34/compta_stats_index 
fix trans removing html
 2020-12-07 22:32:12 +01:00
Laurent Destailleur
efc3bad7c6
Merge pull request #15678 from frederic34/fk_element 
doxygen
 2020-12-07 22:31:08 +01:00
Frédéric FRANCE
eac2a42b1c
remove warning 2020-12-06 16:44:21 +01:00
Frédéric FRANCE
4e18f46f28
doxygen 2020-12-05 23:53:55 +01:00
stickler-ci
3fc4fb79e0 Fixing style errors. 2020-12-05 17:20:28 +00:00
Frédéric FRANCE
90a5c90a5a
fix trans removeing html 2020-12-05 18:19:33 +01:00
Frédéric FRANCE
18319f4fd3
fix trans replace html 2020-12-05 18:05:09 +01:00
Laurent Destailleur
333449ca50 Fix security trans 2020-12-05 13:40:03 +01:00
Alexandre SPANGARO
13f985d280 NEW: Accountancy - Introduce "Level3" - Define account directly in thirdparty 2020-12-04 04:13:42 +01:00
Scrutinizer Auto-Fixer
6df4954b20 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-12-01 01:41:19 +00:00
Laurent Destailleur
00ad6df395 Fight against $_POST 2020-11-30 14:47:07 +01:00
Laurent Destailleur
e7775d2f79 Fix scrutinizer errors 2020-11-30 12:54:47 +01:00
Laurent Destailleur
574919de52 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	.travis.yml
	htdocs/accountancy/bookkeeping/balance.php
	htdocs/adherents/class/subscription.class.php
	htdocs/compta/bank/categ.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/boxes/box_task.php
	htdocs/core/class/commondocgenerator.class.php
	htdocs/core/class/interfaces.class.php
	htdocs/core/lib/project.lib.php
	htdocs/core/modules/modCategorie.class.php
	htdocs/expensereport/class/expensereport.class.php
	htdocs/fichinter/class/fichinterrec.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/install/repair.php
	htdocs/main.inc.php
	htdocs/product/price.php
	htdocs/projet/tasks/time.php
	htdocs/reception/card.php
 2020-11-27 15:45:12 +01:00
Laurent Destailleur
ac3c129735 Clean code 2020-11-27 14:24:15 +01:00
Laurent Destailleur
52cc08f5da FIX option "Show subtotal" on the balance report 2020-11-26 16:12:55 +01:00
Laurent Destailleur
e272130a6a Fix phpcs 2020-11-26 08:40:08 +01:00
Laurent Destailleur
f91226a9f0
Merge pull request #15537 from maboelfotoh/maboelfotoh-fix-pr-13067 
FIX #13067 including opening balance in calculation of displayed balance
 2020-11-25 17:54:09 +01:00
Muhammad Aboelfotoh
551256b779 FIX #13067 including opening balance in calculation of displayed balance 2020-11-25 15:11:09 +00:00
Laurent Destailleur
53cf513173
Merge pull request #15180 from aspangaro/14a1 
NEW: Accountancy - Add export for Gestinum (v3 & v5)
 2020-11-24 09:10:59 +01:00
Laurent Destailleur
941bf26be1
Merge pull request #15488 from aspangaro/14a5 
NEW: Accountancy - Add hooks 'addMoreActionsButtons' on ledger and jo…
 2020-11-23 22:16:11 +01:00
Givriz
dca4cf5987 Feature : ajout de la class "button-cancel" 
Ajout de la class "button-cancel" suite à l'issue #3756 et achèvement de ma tâche Dolibarr.
 2020-11-23 15:12:52 +01:00
Alexandre SPANGARO
248e49ccd1 NEW: Accountancy - Add hooks 'addMoreActionsButtons' on ledger and journal 2020-11-22 22:19:36 +01:00
Laurent Destailleur
60bfbe2e57
Merge pull request #15448 from Givriz/dev 
Feature : creation of a "button-save" class
 2020-11-21 23:44:30 +01:00
Laurent Destailleur
bf94ce6aad Fix warnings 2020-11-21 16:49:54 +01:00
Givriz
c48129e279 Ajout de la class "button-save" 
Ajout de cette class sur les boutons pour pour cloturer une issue ouverte (feature)
 2020-11-19 20:23:38 +01:00
Laurent Destailleur
026d73d9f9
Update thirdparty_lettering_supplier.php 2020-11-12 12:39:56 +01:00
Frédéric FRANCE
dea92299f3
Update thirdparty_lettering_supplier.php 2020-11-10 21:54:34 +01:00
Laurent Destailleur
077821da82
Merge pull request #15342 from grandoc/new_branch_10_11_2020 
fix : display vat_tx instead of Array text
 2020-11-10 14:38:00 +01:00
Laurent Destailleur
ecaf732881
Update sellsjournal.php 2020-11-10 14:37:33 +01:00
Laurent Destailleur
bebdf12f8c
Update purchasesjournal.php 2020-11-10 14:37:00 +01:00
Philippe GRAND
51141883d4 fix : display vat_tx instead of Array% 2020-11-10 11:42:07 +01:00
Laurent Destailleur
47b3b30aaa Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/fourn/product/list.php
	htdocs/product/fournisseurs.php
	htdocs/societe/card.php
 2020-11-10 11:10:35 +01:00
Philippe GRAND
dc0b610fd5 fix : display vat_tx instead of Array text 2020-11-10 11:07:10 +01:00
Laurent Destailleur
73df033000 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/accountancy/journal/bankjournal.php
	htdocs/core/boxes/box_birthdays.php
 2020-11-10 11:05:53 +01:00
Alexandre SPANGARO
25fd41fa93 Dev multifilter jounal on ledger (complete) 2020-11-10 04:17:07 +01:00
Alexandre SPANGARO
77021bf355 Merge remote-tracking branch 'upstream/develop' into 14a1 2020-11-10 04:09:58 +01:00
Laurent Destailleur
4a5c7d299f Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/accountancy/class/accountancyexport.class.php
 2020-11-09 19:47:25 +01:00
Alexandre SPANGARO
0a078da8e4 FIX: Accountancy - Some ajustments on length of the account 2020-11-09 14:59:29 +01:00
Alexandre SPANGARO
617c930574 FIX: Accountancy - Some ajustments on length of the account (general & auxiliary) 2020-11-09 14:13:09 +01:00
Laurent Destailleur
da6c6c9e0a Clean code 2020-11-08 14:39:20 +01:00
Alexandre SPANGARO
6b91f739be Merge remote-tracking branch 'upstream/develop' into 14a1 2020-11-08 03:58:22 +01:00
Alexandre SPANGARO
7adcde3e42 FIX: Search of type on subaccount 2020-11-08 03:51:35 +01:00
Florian HENRY
c9373e318e fix admin 2020-11-07 15:33:23 +01:00
Florian HENRY
1bdd617feb NEW: Multiselect ledger account code filter on book keeping list 2020-11-07 15:31:27 +01:00
Laurent Destailleur
e0ed89c514 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/admin/productaccount.php
	htdocs/compta/facture/card.php
	htdocs/contrat/class/contrat.class.php
	htdocs/core/actions_addupdatedelete.inc.php
	htdocs/product/class/product.class.php
	htdocs/product/price.php
	htdocs/projet/tasks/time.php
 2020-11-01 17:58:41 +01:00
Laurent Destailleur
63a03cdad6 FIX #15208 2020-11-01 14:34:29 +01:00
Scrutinizer Auto-Fixer
ab25e047c0 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-10-31 17:51:30 +00:00
Laurent Destailleur
fce9fea099 Fix params 2020-10-31 15:13:03 +01:00
Scrutinizer Auto-Fixer
7f52920716 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-10-31 13:32:18 +00:00
Laurent Destailleur
4dbac98d8c
Merge pull request #15197 from aspangaro/14a2 
NEW: Accountancy - Add a ledger for subaccount
 2020-10-30 18:12:11 +01:00
Laurent Destailleur
3cefb5f336
Update listbyaccount.php 2020-10-30 17:59:33 +01:00
Alexandre SPANGARO
86ee75363a NEW: Accountancy - Add a ledger for subaccount 2020-10-28 09:49:38 +01:00
Frédéric FRANCE
9ba22d2813
doxygen 2020-10-27 22:07:31 +01:00
Laurent Destailleur
ebdc1f7457 Fix scrutinizer 2020-10-27 19:34:52 +01:00
Frédéric FRANCE
5a3780e062
end of dol_fiche_end 2020-10-27 18:19:31 +01:00
Laurent Destailleur
53009e41fe
Update accountancyexport.class.php 2020-10-27 18:10:38 +01:00
Alexandre SPANGARO
7c1eb128e9 Merge branch '14a1' of https://github.com/aspangaro/dolibarr into 14a1 2020-10-27 16:29:36 +01:00
Alexandre SPANGARO
7a7f51cd00 Fix stickler 2020-10-27 16:29:10 +01:00
stickler-ci
967eb5fa8e Fixing style errors. 2020-10-27 15:20:34 +00:00
Alexandre SPANGARO
0931a42dc2 Move format Charlemagne 2020-10-27 16:17:52 +01:00
Alexandre SPANGARO
1b8f9e6a67 Useless to specify css format export, csv is format by default 2020-10-27 16:14:52 +01:00
Alexandre SPANGARO
d46feda3e5 NEW: Accountancy - Add export for Gestinum (v3 & v5) 2020-10-27 16:13:07 +01:00
Frédéric FRANCE
ae3228b9e0
retrieve the spelling 🎉 2020-10-23 20:08:35 +02:00
Philippe GRAND
e0639209a7 fix : deprecated 2020-10-22 16:43:35 +02:00
Philippe GRAND
0fc054a624 fix : deprecated 2020-10-22 16:43:02 +02:00
Philippe GRAND
3ee7cfc1b7 fix : deprecated 2020-10-22 16:42:32 +02:00
Philippe GRAND
a8b25e32f0 fix : deprecated 2020-10-22 16:40:58 +02:00
Philippe GRAND
d5e456fd36 fix : deprecated 2020-10-22 16:40:03 +02:00
Philippe GRAND
3854808d21 fix : deprecated 2020-10-22 16:39:21 +02:00
Philippe GRAND
9dc93b0e29 fix : deprecated 2020-10-22 16:38:43 +02:00
Philippe GRAND
52b602b1ce fix : deprecated 2020-10-22 16:38:02 +02:00
Philippe GRAND
9260eed12a fix : deprecated 2020-10-22 16:37:06 +02:00
Philippe GRAND
1319765a4f fix : deprecated 2020-10-22 16:35:47 +02:00
Philippe GRAND
1ca6068a41 fix : deprecated 2020-10-22 16:34:12 +02:00
Alexandre SPANGARO
67cf917f7b FIX Binding on expense report (Double rowid) 2020-10-16 11:57:36 +02:00
Florian HENRY
0fee06139a Merge github.com:Dolibarr/dolibarr into develop 2020-10-10 10:23:17 +02:00
Florian HENRY
705b029608 fix return on filtered page when modify accountancy code 2020-10-10 10:22:58 +02:00
Laurent Destailleur
967e7997e6 Trans and clean code 2020-10-09 19:34:57 +02:00
Laurent Destailleur
327ca5f595 css 2020-10-09 18:18:18 +02:00
Laurent Destailleur
4188a21c6b css 2020-10-09 17:59:22 +02:00
Laurent Destailleur
a3e3e0e45c Navigation in chart of account 2020-10-09 17:55:26 +02:00
Laurent Destailleur
efc5dedab4 Fix format number on screen 2020-10-09 12:52:42 +02:00
Scrutinizer Auto-Fixer
1512521d91 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-10-07 13:01:28 +00:00
Laurent Destailleur
294688891d CSS 2020-10-07 01:10:26 +02:00
Laurent Destailleur
ca189099dd Look and feel v13 2020-10-06 17:00:17 +02:00
Laurent Destailleur
95f67309e2 Clean code 2020-10-06 15:11:45 +02:00
Laurent Destailleur
3f5db927bc Fix phpcs 2020-10-06 13:13:07 +02:00
Laurent Destailleur
4701656d95 Fix look and field v13 2020-10-06 13:08:20 +02:00
Laurent Destailleur
1c38379622 Better message 2020-10-06 12:22:58 +02:00
Laurent Destailleur
38acd83f4d Review some titles and tooltip help to be more clear. 2020-10-06 12:17:33 +02:00
Alexandre SPANGARO
6745c377a6 Double line 2020-10-05 22:35:12 +02:00
Alexandre SPANGARO
6a0f2233a6 NEW Accountancy - Move to real ledger, real journals, menu disposition 2020-10-05 21:44:39 +02:00
Laurent Destailleur
25b9460521 Look and feel v12 2020-10-05 18:05:26 +02:00
Laurent Destailleur
9b768b5eab
Merge pull request #14926 from aspangaro/13a17 
NEW Accountancy - Add chart of sub accounts
 2020-10-05 17:20:14 +02:00
stickler-ci
cf76a67712 Fixing style errors. 2020-10-05 08:10:39 +00:00
Alexandre SPANGARO
cab6ef092f NEW Accountancy - Add chart of sub accounts 2020-10-05 10:05:21 +02:00
Frédéric FRANCE
4aa47d14b4
Update bookkeeping.class.php 2020-10-04 20:29:57 +02:00
Laurent Destailleur
e1d156973b phpcs 2020-10-02 02:08:04 +02:00
Laurent Destailleur
813deee4a5 Fix phpcs 2020-10-02 01:14:43 +02:00
Laurent Destailleur
ab68d3febe
Merge pull request #14864 from aspangaro/13a20 
FIX If salaries subledger account not defined, put only in the general account
 2020-10-01 19:29:29 +02:00
Laurent Destailleur
7b3a7c9921 Add token on all url with action=delete 2020-10-01 10:50:54 +02:00
Laurent Destailleur
f442dac2c9 Add token on most GET url for admin action 2020-09-30 15:13:28 +02:00
Laurent Destailleur
805f06fe31 Add token for GET on page to setup journal. 2020-09-30 12:54:05 +02:00
Alexandre SPANGARO
ed26f07783 FIX If salaries subledger account not defined, put only in the general account 2020-09-30 06:46:23 +02:00
Alexandre SPANGARO
fc62ca57b5 Remove old code 2020-09-30 06:37:48 +02:00
Alexandre SPANGARO
d8cad89dee Merge remote-tracking branch 'upstream/develop' into 13a20 2020-09-29 04:55:33 +02:00
Laurent Destailleur
8ae3cabbac
Merge pull request #14842 from aspangaro/13a18 
Fix - Accountancy - select date on periodicity by default & some fix
 2020-09-28 17:20:56 +02:00
Alexandre SPANGARO
17347bf575 New Add column vat rate in page to define accounting account on product/service 2020-09-28 11:08:27 +02:00
Laurent Destailleur
2e79064098 Clean code 2020-09-28 11:07:53 +02:00
Alexandre SPANGARO
bf167ca91d Fix unused variable 2020-09-28 09:40:55 +02:00
Alexandre SPANGARO
d50932499f Fix select date on periodicity by default 2020-09-28 07:03:22 +02:00
Alexandre SPANGARO
347537a205 Accountancy - Some fix 2020-09-28 06:44:01 +02:00
Laurent Destailleur
3c6dda9dd5 Clean code 2020-09-25 10:27:30 +02:00
Laurent Destailleur
f066da1811 Minor security fixes 2020-09-24 16:19:24 +02:00
Tobias Sekan
a72519f353
Merge branch 'develop' into PreselectThirpartyOnNewFromList 2020-09-23 09:09:42 +02:00
Laurent Destailleur
7dd69a2b2b Fix escape 2020-09-19 20:11:04 +02:00
Laurent Destailleur
2d38644ae1 Sanitize sortfield 2020-09-18 17:13:01 +02:00