Commit Graph

95380 Commits

Author SHA1 Message Date
Frédéric FRANCE
5d4004d3f4
fix cache 2021-02-26 23:06:33 +01:00
Frédéric FRANCE
94aa116fa8
fix variable name 2021-02-26 23:01:18 +01:00
Laurent Destailleur
0d4acc53e2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-26 19:39:24 +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
93e51ac64a Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-02-26 19:38:36 +01:00
Laurent Destailleur
e7da1d7fe4 FIX #16431 2021-02-26 19:38:18 +01:00
Laurent Destailleur
a0a6b98f87
Merge pull request #16467 from frederic34/project_code_syntax
code syntax project
2021-02-26 19:25:26 +01:00
Laurent Destailleur
c402a2f37f
Merge pull request #16461 from daraelmin/daraelmin-patch-4
Daraelmin patch 4
2021-02-26 19:25:10 +01:00
Laurent Destailleur
8574d4c987
Merge pull request #16464 from frederic34/m_code_syntax
code syntax m... directories
2021-02-26 19:24:18 +01:00
Laurent Destailleur
338ee6563b
Merge pull request #16463 from frederic34/hrm_code_syntax
code syntax hrm imports install intracommreport loan directory
2021-02-26 19:24:03 +01:00
Laurent Destailleur
7498721629
Merge pull request #16462 from frederic34/ftpholiday_code_syntax
code syntax ftp holiday directory
2021-02-26 19:23:53 +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
81c2ae325b Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-02-26 19:20:32 +01:00
Laurent Destailleur
129120523c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-26 19:20:10 +01:00
Laurent Destailleur
0315fb5fc3 Fix missing in v13 2021-02-26 19:19:48 +01:00
Laurent Destailleur
d5566dbf8f FIX #16431 2021-02-26 19:18:03 +01:00
Frédéric FRANCE
a82df7e6ea
code syntax project 2021-02-26 18:49:22 +01:00
Frédéric FRANCE
16ea342904
code syntax 2021-02-26 18:37:22 +01:00
Frédéric FRANCE
0411321bbe
Merge remote-tracking branch 'origin/m_code_syntax' into m_code_syntax 2021-02-26 18:34:31 +01:00
Frédéric FRANCE
d442ef48ec
Merge remote-tracking branch 'upstream/develop' into m_code_syntax 2021-02-26 18:33:21 +01:00
stickler-ci
6aaf1c2962 Fixing style errors. 2021-02-26 17:28:25 +00:00
Frédéric FRANCE
f73c0abec1
code syntax m... directories 2021-02-26 18:26:44 +01:00
Frédéric FRANCE
6cef78befb
code syntax hrm imports install intracommreport loan directory 2021-02-26 18:20:21 +01:00
stickler-ci
629efe7d5a Fixing style errors. 2021-02-26 17:14:26 +00:00
Frédéric FRANCE
5f1d7ee763
code syntax ftp holiday directory 2021-02-26 17:59:31 +01:00
daraelmin
739cd0466d
Fix Dolibarr#16418 missing title in "iNew cCash Fence" 2021-02-26 17:24:39 +01:00
daraelmin
1b6bc8b132
Fix #16418 missing in "Tags of transactions" 2021-02-26 17:18:09 +01:00
daraelmin
0749585687
Fix #16418 title in "Transaction list by category" 2021-02-26 17:11:18 +01:00
daraelmin
ea18a47113
Fix #16418 missing title in "internal transfer" 2021-02-26 17:01:53 +01:00
Laurent Destailleur
50ae2d33b2
Merge pull request #16460 from frederic34/product_code_syntax
Product code syntax
2021-02-26 16:47:53 +01:00
Laurent Destailleur
fcdd550d7c
Merge pull request #16112 from fappels/develop_mo_pmp
Add missing pmp valorisation to MO production. (Issue #16072)
2021-02-26 16:46:40 +01:00
Frédéric FRANCE
96b0f3a25c
code syntax directory 2021-02-26 16:19:52 +01:00
Frédéric FRANCE
7ac8fcbca1
Merge remote-tracking branch 'origin/product_code_syntax' into product_code_syntax 2021-02-26 16:12:57 +01:00
Frédéric FRANCE
8029a3317f
Merge remote-tracking branch 'upstream/develop' into product_code_syntax 2021-02-26 16:11:34 +01:00
stickler-ci
487876101f Fixing style errors. 2021-02-26 15:00:47 +00:00
Francis Appels
3216120f44 MoLine origin is bomline not bom 2021-02-26 15:38:02 +01:00
Frédéric FRANCE
155aeb6213
code syntax opensurvey directory 2021-02-26 15:27:57 +01:00
Frédéric FRANCE
be59a70e39
code syntax paypal paybox directory 2021-02-26 15:27:05 +01:00
Frédéric FRANCE
c5ff699b3f
code syntax printing directory 2021-02-26 15:26:09 +01:00
Laurent Destailleur
5095e7f927
Merge pull request #16124 from hregis/fix_avoid_missing_url_and_token
Fix avoid missing url and token
2021-02-26 15:21:56 +01:00
Laurent Destailleur
c4e98486f7 Trans 2021-02-26 15:15:55 +01:00
Laurent Destailleur
b95fd1697f
Merge pull request #16434 from altairisfr/serials_pr
differentiate serial numbers from lot management
2021-02-26 15:06:35 +01:00
Laurent Destailleur
5d0a0fe341 Clean code 2021-02-26 14:53:16 +01:00
Laurent Destailleur
92e65291e6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-26 14:33:53 +01:00
Laurent Destailleur
93f0754be9 Fix removed a bugged section (not used, was in develop mode only) 2021-02-26 14:33:27 +01:00
Frédéric FRANCE
fa7cd70052
code syntax product directory 2021-02-26 14:25:17 +01:00
Laurent Destailleur
2f649d6582
Merge pull request #16459 from frederic34/theme_code_syntax
code syntax theme directory
2021-02-26 13:52:42 +01:00
Laurent Destailleur
2604426499
Merge pull request #16458 from frederic34/ticket_code_syntax
code syntax ticket directory
2021-02-26 13:52:33 +01:00
Laurent Destailleur
29467e983a Code comment 2021-02-26 13:50:54 +01:00
Frédéric FRANCE
920dabaab7
code syntax theme directory 2021-02-26 13:31:09 +01:00