2
0
forked from Wavyzz/dolibarr
Commit Graph

702 Commits

Author SHA1 Message Date
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
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
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
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
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
dce1e56a78 FIX #18912 Accountancy - SQL error when custom group is added without country defined 2021-10-18 05:44:22 +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
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
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
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
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
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
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
2dd91bf312 Clean code 2021-08-27 23:36:06 +02:00
Laurent Destailleur
46d993c9a6 Clean code 2021-08-27 22:42:04 +02:00
Christian Foellmann
f094b4c70c fix up most of the remaining submit inputs 2021-08-24 17:04:17 +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
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
Frédéric FRANCE
42252abc07 remove debug 2021-07-28 10:14:57 +02:00
Alexandre SPANGARO
8bde61c2c6 FIX Accountancy - Link from admin 2021-07-05 06:58:10 +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
2fdc6d9461 NEW : rewrite bind accountancy code finding on customer invoice 2021-06-04 11:35:12 +02:00
Florian Mortgat
e6deab5c85 FIX proposed new feature: autocomplete for accounting account groups 2021-05-28 08:42:38 +02:00