Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-01-06 09:02:59 +01:00
Code Issues Packages Projects Releases Wiki Activity
95,359 Commits 37 Branches 191 Tags
c1a75d7b70261a23b2981c6de6e6f848e87c4bf5
Commit Graph

84025 Commits

Author SHA1 Message Date
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
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
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
Frédéric FRANCE
920dabaab7 code syntax theme directory 2021-02-26 13:31:09 +01:00
Frédéric FRANCE
4c1004ea5d code syntax ticket directory 2021-02-26 13:27:00 +01:00
Laurent Destailleur
6e49a0afa3 Merge pull request #16457 from frederic34/user_code_syntax 
code syntax user directory
 2021-02-26 13:25:16 +01:00
Laurent Destailleur
8aefb1b641 Merge pull request #16426 from josemariagomezroncero/patch-9 
NEW Set status of all variant when setting status of parent
 2021-02-26 13:25:04 +01:00
Laurent Destailleur
afcc3cb3e6 Update ProductCombination.class.php 2021-02-26 13:24:30 +01:00
Laurent Destailleur
77356afd03 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-26 13:22:28 +01:00
Laurent Destailleur
9e202467e0 Code comment 2021-02-26 13:22:13 +01:00
Laurent Destailleur
a9aa4b439a Merge pull request #16456 from frederic34/variants_code_syntax 
code syntax variants webservice directory
 2021-02-26 13:19:48 +01:00
Laurent Destailleur
e43314e81c Merge pull request #16453 from frederic34/zapier_code_syntax 
code syntax zapier directory
 2021-02-26 13:19:38 +01:00
Frédéric FRANCE
b970f4eca6 code syntax user directory 2021-02-26 13:18:40 +01:00
Laurent Destailleur
618d40d1a5 Merge branch 'develop' into develop 2021-02-26 13:17:12 +01:00
Laurent Destailleur
9fb15bde99 Merge pull request #16429 from bafbes/abb120369 
Add region code and id into fetch of thirdparty
 2021-02-26 13:16:00 +01:00
Laurent Destailleur
a296b86ee1 Update societe.class.php 2021-02-26 13:15:02 +01:00
stickler-ci
2cbdbf4f60 Fixing style errors. 2021-02-26 12:12:30 +00:00
Frédéric FRANCE
9fb263bcd7 Merge remote-tracking branch 'upstream/develop' into zapier_code_syntax 2021-02-26 13:11:57 +01:00
Frédéric FRANCE
db871994fb code syntax variants webservice directory 2021-02-26 13:10:10 +01:00
Laurent Destailleur
ad63ac6bb0 Update societe.class.php 2021-02-26 13:08:24 +01:00
Laurent Destailleur
0d7a2c1d81 Merge pull request #16406 from frederic34/bom_codesyntax 
code syntax bom directory
 2021-02-26 13:05:45 +01:00
Laurent Destailleur
1c371d6bfa Merge pull request #16414 from frederic34/contract_code_syntax 
code syntax contrat directory
 2021-02-26 13:05:36 +01:00
Laurent Destailleur
44d4fb6517 Merge pull request #16407 from frederic34/casdesk_code_syntax 
code syntax cashdesk directory
 2021-02-26 13:05:27 +01:00
Laurent Destailleur
aaf1863486 Merge pull request #16405 from frederic34/api_codesyntax 
code syntax api directory
 2021-02-26 13:05:18 +01:00
Laurent Destailleur
9c6a6baec3 Merge pull request #16455 from frederic34/patch-3 
really fix typo
 2021-02-26 13:05:02 +01:00
Laurent Destailleur
a5925cc2cb Merge branch 'develop' into count_project_head 2021-02-26 13:02:54 +01:00
Frédéric FRANCE
cb1e36de9c really fix typo 2021-02-26 12:58:41 +01:00