Commit Graph

83565 Commits

Author SHA1 Message Date
Laurent Destailleur
921cc08743 Fix url 2020-02-13 18:41:03 +01:00
Laurent Destailleur
7e2e0b3986 Fix readme 2020-02-13 18:26:55 +01:00
Laurent Destailleur
fc018d0063 Module MO is now stable 2020-02-13 17:24:29 +01:00
Laurent Destailleur
306b8d190f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-02-13 15:42:54 +01:00
Laurent Destailleur
c6c941e09a Fix phpcs 2020-02-13 15:42:41 +01:00
Laurent Destailleur
24290659b2
Merge pull request #13104 from Dolibarr/scrutinizer-patch-4
Scrutinizer Auto-Fixes
2020-02-13 12:41:13 +01:00
Scrutinizer Auto-Fixer
011803ac71 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-02-13 11:36:05 +00:00
Laurent Destailleur
46bccf88d3 Fix var not initialized 2020-02-13 12:33:34 +01:00
Laurent Destailleur
9d4075cc19 Try to exempt 2 labels 2020-02-13 12:23:32 +01:00
Laurent Destailleur
9e165a782f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-02-13 11:58:23 +01:00
Laurent Destailleur
45ed02ec13 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-02-13 11:57:26 +01:00
Laurent Destailleur
c2ef63f35c NEW Close #13011 Add button create thirdparty when creating intervention 2020-02-13 11:57:13 +01:00
Laurent Destailleur
e511deb8e7 FIX #13096 2020-02-13 11:39:08 +01:00
Laurent Destailleur
78d4978d31 FIX #13100 2020-02-13 11:26:11 +01:00
Laurent Destailleur
a4f13194c3
Merge pull request #12503 from atm-greg/New_Supplier_Packaging
NEW Experiment supplier packaging with option PRODUCT_USE_SUPPLIER_PACKAGING: Using price according to the minimum quantity
2020-02-13 10:50:56 +01:00
Laurent Destailleur
d57c4649d4
Merge pull request #13101 from Dolibarr/scrutinizer-patch-3
Scrutinizer Auto-Fixes
2020-02-13 10:45:43 +01:00
Scrutinizer Auto-Fixer
17010478ba Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-02-13 09:44:08 +00:00
Laurent Destailleur
33b7fc11f0 Fix status of emailing target 2020-02-13 10:41:53 +01:00
Laurent Destailleur
495b3d54f1 Fix status of emailing target 2020-02-13 10:41:31 +01:00
Laurent Destailleur
1973f2c9b9 Fix look and feel v11 2020-02-13 10:07:34 +01:00
Laurent Destailleur
21d9b00fce Fix missing amount in table of prelevement 2020-02-13 00:05:01 +01:00
Laurent Destailleur
9667482ef2 Doc 2020-02-13 00:04:17 +01:00
Laurent Destailleur
138cf649df Fix missing amount in table of prelevement 2020-02-12 23:17:46 +01:00
Laurent Destailleur
4762bafb02 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/adherents/subscription/list.php
	htdocs/mrp/class/mo.class.php
2020-02-12 22:58:37 +01:00
Laurent Destailleur
ccced09113 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/adherents/subscription/list.php
	htdocs/comm/propal/list.php
	htdocs/core/class/html.formmail.class.php
2020-02-12 22:54:55 +01:00
Laurent Destailleur
9f3bedb7ea Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-02-12 22:45:39 +01:00
Laurent Destailleur
139dfc3022 Debug MRP module 2020-02-12 22:45:27 +01:00
Laurent Destailleur
2ce0aa87e6 Responsive 2020-02-12 22:10:26 +01:00
Laurent Destailleur
bf2051ff80 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-02-12 22:03:01 +01:00
Laurent Destailleur
4981da235c Fix phpcs 2020-02-12 22:00:44 +01:00
Laurent Destailleur
e69b362fb5
Merge pull request #13079 from RubenRuCh/11.0
FIX: #13038 ExpenseReport PDF - custom category description is not correct
2020-02-12 21:59:23 +01:00
Laurent Destailleur
fff81751ee
Merge pull request #13072 from mapiolca/patch-30
Add Project Title in header of pdf
2020-02-12 21:58:36 +01:00
Laurent Destailleur
d78e12db08 Typo 2020-02-12 21:56:00 +01:00
stickler-ci
f8eaca24af Fixing style errors. 2020-02-12 20:54:56 +00:00
Laurent Destailleur
c31fcb3981
Merge branch 'develop' into patch-30 2020-02-12 21:53:02 +01:00
Laurent Destailleur
0d366c45e5 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-02-12 21:43:44 +01:00
Laurent Destailleur
6be746e219 Fix replenishment for virtual stock check if module is on or off 2020-02-12 21:42:48 +01:00
Laurent Destailleur
cfd64c7171 Fix class not found 2020-02-12 21:31:49 +01:00
Laurent Destailleur
0f12003782 Trans 2020-02-12 21:20:55 +01:00
Laurent Destailleur
75774ec6c9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-02-12 20:30:30 +01:00
Laurent Destailleur
7931734ecb Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/modules/modUser.class.php
2020-02-12 20:30:20 +01:00
Laurent Destailleur
83b5fe3c71 FIX #13077 Replace left join with inner join (left join was useless) 2020-02-12 20:24:58 +01:00
Laurent Destailleur
3f4c787c84 Fix physical stock were truncated in product/reassort page 2020-02-12 20:22:53 +01:00
Laurent Destailleur
18f0a0f73e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-02-12 19:36:43 +01:00
Laurent Destailleur
d419315e98 FIX #13048 2020-02-12 19:36:29 +01:00
Laurent Destailleur
d70712fd61
Merge pull request #13089 from mapiolca/patch-31
Fix the display of the banner with multicompany
2020-02-12 18:51:08 +01:00
Laurent Destailleur
50f0b61f1e
Update bankjournal.php 2020-02-12 18:50:33 +01:00
Laurent Destailleur
4a5467234d
Merge pull request #13074 from simicar29/simicar29-patch-4
Show extrafields only when enabled
2020-02-12 18:47:32 +01:00
Laurent Destailleur
4678c7ef7a
Merge pull request #13081 from bb2a/patch-14
Constant MAIN_DEFAULT_PAYMENT_TYPE_ID can used to set default value
2020-02-12 18:46:08 +01:00
Laurent Destailleur
08bd69d577
Merge pull request #13082 from oscim/patch-20
report and apply GETPOST method
2020-02-12 18:43:59 +01:00