Commit Graph

4914 Commits

Author SHA1 Message Date
Laurent Destailleur
1ea8fed9c4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-11-07 11:16:20 +01:00
Laurent Destailleur
feef992d39 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-11-07 11:16:09 +01:00
Frédéric FRANCE
35751a80ab
100% centpercent 2019-11-05 21:24:41 +01:00
Laurent Destailleur
d972fa8bcb Fix pb with model_pdf 2019-11-05 20:20:57 +01:00
Laurent Destailleur
94bd0f71d9 Fix pb with permission 2019-11-05 19:41:30 +01:00
Laurent Destailleur
ce1dec253f FIX #11364 2019-11-05 12:47:38 +01:00
Laurent Destailleur
0347d82660
Merge pull request #12303 from frederic34/patch-2
css
2019-11-04 20:31:02 +01:00
Laurent Destailleur
5d41268d1e CSS 2019-11-04 19:28:04 +01:00
Laurent Destailleur
11500fb8d9 FIX confusion between permto... and permisstionto... 2019-11-04 15:33:49 +01:00
Frédéric FRANCE
534f8712a3
Update fournisseurs.php 2019-11-02 18:11:18 +01:00
Frédéric FRANCE
4a564cc05d
Update product.class.php 2019-11-02 18:10:01 +01:00
Laurent Destailleur
6f82c212a0 Finished migration to the new architecture of extrafields 2019-11-02 17:38:19 +01:00
Laurent Destailleur
496f93911f
Merge pull request #11821 from Tim-Otte/develop
NEW Extrafields support in product supplier prices
2019-11-02 16:19:13 +01:00
Laurent Destailleur
8485747713 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-11-02 13:37:43 +01:00
Laurent Destailleur
9e69b12847 FIX #12281 2019-11-02 13:37:30 +01:00
Laurent Destailleur
e087ac434d
Merge pull request #12283 from frederic34/socid
replace deprecated user->societe_id by user->socid
2019-11-02 13:34:21 +01:00
Laurent Destailleur
80fd5af32b
Merge pull request #12271 from frederic34/patch-3
css
2019-11-02 13:30:38 +01:00
Laurent Destailleur
7fae6d60a7
Merge pull request #12270 from frederic34/patch-2
css
2019-11-02 13:09:38 +01:00
Laurent Destailleur
d232b7a387
Merge pull request #12286 from grandoc/new_branch_01_11_2019
add some comment
2019-11-02 13:00:23 +01:00
Laurent Destailleur
58ffb73627 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-11-02 12:59:49 +01:00
Laurent Destailleur
45c77b4560 Renaming some libelle into label 2019-11-02 12:59:38 +01:00
Laurent Destailleur
25e64b0610
Merge branch 'develop' into socid 2019-11-02 12:01:06 +01:00
Laurent Destailleur
c12e66e2a2
Merge branch 'develop' into new_branch_01_11_2019 2019-11-02 12:00:04 +01:00
Laurent Destailleur
68691ddd8a
Merge pull request #12265 from grandoc/new_branch_30_10_2019
add comment
2019-11-02 11:49:28 +01:00
Laurent Destailleur
41a3861465
Merge pull request #12290 from ptibogxiv/patch-273
FIX prices by customer API
2019-11-02 11:47:32 +01:00
Frédéric FRANCE
77d4ca81dc
Merge remote-tracking branch 'upstream/develop' into socid 2019-11-02 09:14:15 +01:00
Laurent Destailleur
cea2c3a9f4 Look and feel v11 2019-11-01 23:58:14 +01:00
Frédéric FRANCE
dbed10a701
Merge remote-tracking branch 'upstream/develop' into socid 2019-11-01 21:39:20 +01:00
stickler-ci
0e260c859b Fixing style errors. 2019-11-01 19:28:39 +00:00
ptibogxiv
6f77885686
Update api_products.class.php 2019-11-01 20:26:39 +01:00
stickler-ci
bc5e6c867f Fixing style errors. 2019-11-01 14:37:21 +00:00
ptibogxiv
0f80ba5353
FIX prices by customer API 2019-11-01 15:36:48 +01:00
Laurent Destailleur
e3b5be7475 All properties 'libstatut', 'labelstatut', 'labelstatus' were renamed
into 'labelStatus'.
All properties 'labelstatusshort' and 'labelstatut_short' were renamed
into 'labelStatusShort'.
2019-11-01 12:52:03 +01:00
Philippe GRAND
07cd656a1c add some comment 2019-11-01 10:56:46 +01:00
Laurent Destailleur
68a4ddceed Look and feel v11 2019-10-31 23:29:17 +01:00
Frédéric FRANCE
e93aaa2a75
replace deprecated user->societe_id by user->socid 2019-10-31 20:46:31 +01:00
atm-josselin
5550a62afa Fix misspelling on field of productlot 2019-10-31 11:05:45 +01:00
Frédéric FRANCE
3738fb87ed
css 2019-10-30 18:42:33 +01:00
Frédéric FRANCE
bfe683d031
css 2019-10-30 18:40:07 +01:00
Philippe GRAND
b029febff1 add some comment 2019-10-30 10:07:54 +01:00
Laurent Destailleur
19f97fb23b
Merge pull request #12211 from frederic34/patch-2
doxygen product.class.php
2019-10-30 03:16:22 +01:00
Laurent Destailleur
4eedf4a113 Merge branch '10.0' of https://github.com/dolibarr/dolibarr into develop 2019-10-29 11:48:36 +01:00
Laurent Destailleur
9483e367ca Merge branch '9.0' of https://github.com/dolibarr/dolibarr into 10.0
Conflicts:
	htdocs/expensereport/class/expensereport.class.php
	htdocs/product/stock/replenishorders.php
2019-10-29 11:48:11 +01:00
Laurent Destailleur
149d63757f Space 2019-10-29 11:43:56 +01:00
Laurent Destailleur
e58ecaaa64 Merge branch '8.0' of https://github.com/dolibarr/dolibarr into 9.0
Conflicts:
	htdocs/product/stock/replenishorders.php
2019-10-29 11:43:35 +01:00
Laurent Destailleur
2814a5c07b Fix phpcs 2019-10-24 21:47:31 +02:00
Laurent Destailleur
8d21144521 Beautify select of products in vendor record 2019-10-24 20:33:16 +02:00
Laurent Destailleur
443ca85f43 NEW Beautify the select of warehouses 2019-10-24 19:48:25 +02:00
Laurent Destailleur
31452dad42 NEW Beautify the select of warehouses 2019-10-24 19:34:28 +02:00
Laurent Destailleur
6855f588b5 Use dolGetStatus 2019-10-24 16:38:06 +02:00