Laurent Destailleur
|
e60fff39d9
|
Fix phpcs
|
2019-11-04 20:36:55 +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
|
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
|
45c77b4560
|
Renaming some libelle into label
|
2019-11-02 12:59:38 +01:00 |
|
Laurent Destailleur
|
c12e66e2a2
|
Merge branch 'develop' into new_branch_01_11_2019
|
2019-11-02 12:00:04 +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
|
5999d8a05a
|
Update product.class.php
|
2019-10-24 16:11:05 +02:00 |
|
Frédéric FRANCE
|
93a8b1d2a3
|
Update product.class.php
|
2019-10-24 16:09:35 +02:00 |
|
Laurent Destailleur
|
f0355b3057
|
Debug option PRODUCT_ADD_NET_MEASURE
|
2019-10-23 02:58:39 +02:00 |
|
Laurent Destailleur
|
e7e9898e0d
|
FIX Better compatible fix for the trouble of weight / size units
|
2019-10-22 18:36:36 +02:00 |
|
Frédéric FRANCE
|
86f22c4563
|
do not ignore lines with mix od tabs and spaces
|
2019-10-20 17:17:22 +02:00 |
|
Laurent Destailleur
|
24dc7fb667
|
Merge pull request #12173 from OPEN-DSI/new-product-clone-customer-prices
NEW add clone customers prices in clone product or service
|
2019-10-20 13:27:50 +02:00 |
|
Frédéric FRANCE
|
7581275316
|
wip
|
2019-10-20 11:59:21 +02:00 |
|
VESSILLER
|
801092d848
|
NEW add clone customers prices in clone product or service
|
2019-10-18 15:10:22 +02:00 |
|
Frédéric FRANCE
|
e75f7d448c
|
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen
|
2019-10-16 20:00:01 +02:00 |
|
Laurent Destailleur
|
4ca9fddfcc
|
Update product.class.php
|
2019-10-16 14:26:49 +02:00 |
|
Cédric
|
3429cb7c1d
|
New: Update product type with update method
|
2019-10-14 22:42:38 +02:00 |
|
Laurent Destailleur
|
29384d9a71
|
Merge branch 'develop' into patch-187
|
2019-10-09 13:02:47 +02:00 |
|
ptibogxiv
|
10c29887d6
|
Update product.class.php
|
2019-10-08 16:15:12 +02:00 |
|
ptibogxiv
|
e2d76f6f24
|
Update product.class.php
|
2019-10-08 16:13:59 +02:00 |
|
altairis
|
85bbf1decb
|
Merge branch 'develop' into prodstats
|
2019-10-04 11:05:36 +02:00 |
|
Alexandre SPANGARO
|
91b3bf76fd
|
Merge branch 'develop' into 11.0_https
|
2019-10-01 06:11:43 +02:00 |
|
Laurent Destailleur
|
6858dce344
|
Rename table for categorie of warehouses
|
2019-09-27 13:28:28 +02:00 |
|
Laurent Destailleur
|
961f2b5165
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/categories/viewcat.php
htdocs/fourn/class/fournisseur.product.class.php
htdocs/takepos/invoice.php
|
2019-09-24 14:25:02 +02:00 |
|
Laurent Destailleur
|
6431e8e16d
|
FIX SQL injection on qty
|
2019-09-24 12:43:44 +02:00 |
|
Alexandre SPANGARO
|
02dbc11f98
|
Move Gnu.org to https
|
2019-09-23 21:55:30 +02:00 |
|
stickler-ci
|
1e8663b1c8
|
Fixing style errors.
|
2019-09-10 18:48:55 +00:00 |
|
ptibogxiv
|
651fbde64d
|
Merge branch 'develop' into patch-187
|
2019-09-10 20:46:54 +02:00 |
|
Laurent Destailleur
|
61cf47aa16
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-09-10 00:14:07 +02:00 |
|
Laurent Destailleur
|
a5f7211730
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
htdocs/accountancy/bookkeeping/balance.php
htdocs/install/repair.php
|
2019-09-06 16:10:55 +02:00 |
|
Laurent Destailleur
|
348ab4765c
|
Fix sql injection
|
2019-09-06 15:20:04 +02:00 |
|
ptibogxiv
|
1b4788c6d0
|
Update product.class.php
|
2019-08-24 14:21:41 +02:00 |
|
ptibogxiv
|
0ce22d68ef
|
Update product.class.php
|
2019-08-10 09:43:26 +02:00 |
|
ptibogxiv
|
4f69be2c2c
|
Update product.class.php
|
2019-08-10 09:12:40 +02:00 |
|
ptibogxiv
|
33cf4d8417
|
Update product.class.php
|
2019-08-10 09:12:15 +02:00 |
|
ptibogxiv
|
3e94b3dc59
|
FIX count negative in stats whithcredit note
|
2019-08-06 16:54:44 +02:00 |
|
ptibogxiv
|
d22c2960b7
|
Update product.class.php
|
2019-08-06 00:14:19 +02:00 |
|
ptibogxiv
|
2d77bfd873
|
Update product.class.php
|
2019-08-04 14:50:25 +02:00 |
|
ptibogxiv
|
c9e481d6f7
|
Update product.class.php
|
2019-08-04 14:09:59 +02:00 |
|
ptibogxiv
|
f5f6882583
|
Update product.class.php
|
2019-08-04 13:42:50 +02:00 |
|
Laurent Destailleur
|
adfbd62f8b
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-07-14 00:44:35 +02:00 |
|
Laurent Destailleur
|
694be619b2
|
Fix doxygen
|
2019-07-11 22:16:32 +02:00 |
|
Laurent Destailleur
|
b065cbc6f8
|
FIX #11446
|
2019-07-04 12:09:04 +02:00 |
|
atm-josselin
|
c24a95b7ad
|
Sanitize at creation of the product instead of the creation of the filepath
|
2019-07-01 09:31:01 +02:00 |
|
Laurent Destailleur
|
b177787f0a
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
htdocs/product/class/product.class.php
|
2019-06-29 18:28:51 +02:00 |
|
Laurent Destailleur
|
93b0e45246
|
Fix duplicate class in some cases
|
2019-06-29 02:27:58 +02:00 |
|
Laurent Destailleur
|
36e240a16d
|
NEW Add statistics on product into contracts
|
2019-06-29 02:03:57 +02:00 |
|