Laurent Destailleur
|
da6c6c9e0a
|
Clean code
|
2020-11-08 14:39:20 +01:00 |
|
Laurent Destailleur
|
924923ec41
|
Fix warning
|
2020-11-07 19:48:42 +01:00 |
|
Laurent Destailleur
|
ed8a0093ff
|
Debug v13
|
2020-11-05 22:25:14 +01:00 |
|
Laurent Destailleur
|
dd97ae94d0
|
css
|
2020-11-05 11:24:33 +01:00 |
|
Laurent Destailleur
|
2668c07e5a
|
Clean code
|
2020-11-03 01:25:58 +01:00 |
|
Laurent Destailleur
|
83a7b19333
|
Look and feel v13
|
2020-11-02 11:41:07 +01:00 |
|
Laurent Destailleur
|
e0ed89c514
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/accountancy/admin/productaccount.php
htdocs/compta/facture/card.php
htdocs/contrat/class/contrat.class.php
htdocs/core/actions_addupdatedelete.inc.php
htdocs/product/class/product.class.php
htdocs/product/price.php
htdocs/projet/tasks/time.php
|
2020-11-01 17:58:41 +01:00 |
|
Laurent Destailleur
|
45f834cb15
|
FIX #15199
|
2020-11-01 15:20:33 +01:00 |
|
Frédéric FRANCE
|
d9bf49c5dc
|
phpcs
|
2020-10-31 21:04:38 +01:00 |
|
Scrutinizer Auto-Fixer
|
ab25e047c0
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-10-31 17:51:30 +00:00 |
|
stickler-ci
|
284c9bc6a8
|
Fixing style errors.
|
2020-10-31 13:34:01 +00:00 |
|
Scrutinizer Auto-Fixer
|
7f52920716
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-10-31 13:32:18 +00:00 |
|
Frédéric FRANCE
|
8190711342
|
doxygen
|
2020-10-30 18:01:01 +01:00 |
|
Laurent Destailleur
|
a24071492e
|
Start fix for php8 compatibility
|
2020-10-30 05:56:07 +01:00 |
|
Laurent Destailleur
|
f9713a5752
|
Merge pull request #15206 from frederic34/patch-10
The constant MissingIds was not found.
|
2020-10-29 17:46:16 +01:00 |
|
Frédéric FRANCE
|
f5673fd08a
|
doxygen
|
2020-10-28 22:47:29 +01:00 |
|
Frédéric FRANCE
|
09b8d166dd
|
The constant MissingIds was not found.
The constant MissingIds was not found. Maybe you did not declare it correctly or list all dependencies?
|
2020-10-28 18:21:45 +01:00 |
|
Laurent Destailleur
|
ef59b71cdf
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/product/class/product.class.php
htdocs/product/stats/card.php
|
2020-10-28 17:02:20 +01:00 |
|
Laurent Destailleur
|
f02a35d398
|
Fix bad array when year is not defined into graph stat of products
|
2020-10-28 16:47:00 +01:00 |
|
Laurent Destailleur
|
6363a6cd60
|
Fix sanitize
|
2020-10-28 14:11:46 +01:00 |
|
Laurent Destailleur
|
47dfe633f9
|
Fix filter on date on statistics of products
|
2020-10-28 13:19:35 +01:00 |
|
Laurent Destailleur
|
9595d56235
|
Merge pull request #15186 from fappels/13_fix_delete_product_ajax
Fix delete product using ajax
|
2020-10-27 20:03:00 +01:00 |
|
Scrutinizer Auto-Fixer
|
a2a9c51e50
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-10-27 18:46:07 +00:00 |
|
Francis Appels
|
828df6c134
|
Fix delete product using ajax
|
2020-10-27 19:45:12 +01:00 |
|
Laurent Destailleur
|
ec6c735d89
|
Clean code
|
2020-10-27 19:44:15 +01:00 |
|
Laurent Destailleur
|
f54f67cae3
|
Fix sanitizing
|
2020-10-27 19:06:41 +01:00 |
|
Frédéric FRANCE
|
5a3780e062
|
end of dol_fiche_end
|
2020-10-27 18:19:31 +01:00 |
|
Laurent Destailleur
|
0abce469e9
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-10-26 19:09:08 +01:00 |
|
Laurent Destailleur
|
f18a13b2d4
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
htdocs/product/class/productcustomerprice.class.php
|
2020-10-26 19:08:11 +01:00 |
|
Laurent Destailleur
|
78a52eda96
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
htdocs/main.inc.php
htdocs/product/class/productcustomerprice.class.php
|
2020-10-26 19:05:30 +01:00 |
|
Marc de Lima Lucio
|
3f839c2a96
|
FIX: product customer prices: missing triggers in CRUD class
|
2020-10-26 16:11:21 +01:00 |
|
Laurent Destailleur
|
4d9c8e2225
|
Merge pull request #15124 from frederic34/retrieve
retrieve the spelling
|
2020-10-25 14:48:51 +01:00 |
|
Frédéric FRANCE
|
7cfa710d48
|
replace & by &&
|
2020-10-23 21:53:18 +02:00 |
|
Frédéric FRANCE
|
ae3228b9e0
|
retrieve the spelling 🎉
|
2020-10-23 20:08:35 +02:00 |
|
Laurent Destailleur
|
6b6ce568c7
|
Merge pull request #15109 from frederic34/patch-6
doxygen
|
2020-10-23 04:07:29 +02:00 |
|
Frédéric FRANCE
|
9a470fa42d
|
replace deprecated
|
2020-10-22 22:50:03 +02:00 |
|
Frédéric FRANCE
|
ae1adfb2d7
|
Update product.class.php
|
2020-10-22 22:33:35 +02:00 |
|
Laurent Destailleur
|
42963f3059
|
Merge pull request #15105 from frederic34/patch-6
Update product.class.php
|
2020-10-22 21:36:11 +02:00 |
|
Laurent Destailleur
|
9699bdc0fa
|
Fix phpcs
|
2020-10-22 21:31:34 +02:00 |
|
Frédéric FRANCE
|
36ad3bfbc9
|
Update product.class.php
|
2020-10-22 21:11:49 +02:00 |
|
Laurent Destailleur
|
fb7202b7f8
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-10-22 17:55:47 +02:00 |
|
Laurent Destailleur
|
0616b9bc9b
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/prelevement/card.php
htdocs/compta/prelevement/line.php
htdocs/core/class/commonobject.class.php
htdocs/core/lib/functions2.lib.php
htdocs/core/tpl/card_presend.tpl.php
htdocs/expensereport/class/expensereport.class.php
htdocs/fourn/class/fournisseur.commande.class.php
|
2020-10-22 17:55:38 +02:00 |
|
Laurent Destailleur
|
a17c391efe
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
htdocs/product/composition/card.php
|
2020-10-22 17:38:48 +02:00 |
|
Laurent Destailleur
|
cfcac7e053
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
htdocs/core/lib/functions2.lib.php
|
2020-10-22 17:34:48 +02:00 |
|
Laurent Destailleur
|
3369379ba1
|
Update card.php
|
2020-10-22 16:34:23 +02:00 |
|
Marc de Lima Lucio
|
34dd486b6c
|
FIX: virtual products: displayed value is by unit
|
2020-10-22 16:18:37 +02:00 |
|
Marc de Lima Lucio
|
a232a19e7d
|
FIX: virtual products: supplier discount was not applied in component list
|
2020-10-22 15:16:33 +02:00 |
|
kamel
|
134994882c
|
NEW : Calculate the virtual stock in transverse mode ( not on getEntity('commande'), ... but on getEntity('stock') )
|
2020-10-20 15:52:29 +02:00 |
|
Laurent Destailleur
|
7504f92a41
|
Standardize code and look and feel
|
2020-10-16 13:30:20 +02:00 |
|
Florian HENRY
|
6a4e01de1d
|
fix review
|
2020-10-15 08:36:04 +02:00 |
|