Laurent Destailleur
|
48a4ed656b
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/expensereport/class/expensereport.class.php
htdocs/projet/element.php
htdocs/supplier_proposal/class/supplier_proposal.class.php
|
2021-02-09 14:08:49 +01:00 |
|
Laurent Destailleur
|
a84bc05f01
|
Merge pull request #16146 from FHenry/12_fix_pricemin_PRODUIT_CUSTOMER_PRICES
FIX: manage price min for PRODUIT_CUSTOMER_PRICES
|
2021-02-09 13:39:25 +01:00 |
|
Florian HENRY
|
dbbebba497
|
this->errors is set on triggers action must be set by callers
|
2021-02-08 20:44:40 +01:00 |
|
Laurent Destailleur
|
6e6b5973b8
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
|
2021-02-08 17:35:44 +01:00 |
|
Laurent Destailleur
|
8b3c872f2a
|
Fix warning
|
2021-02-08 17:35:21 +01:00 |
|
Laurent Destailleur
|
3b1143df91
|
Merge pull request #16223 from ATM-Consulting/fix/12.0_order_addline_remove_warning
FIX: warning when adding a line if $remise_percent is an empty string
|
2021-02-08 17:34:29 +01:00 |
|
Florian Mortgat
|
ff3707b650
|
FIX: warning when adding a line if $remise_percent is an empty string
|
2021-02-08 17:24:40 +01:00 |
|
Laurent Destailleur
|
c5201b95bb
|
FIX Must not be able to edit vat of all lines if not draft
|
2021-02-02 16:12:03 +01:00 |
|
Florian HENRY
|
d3d0617996
|
fix: manage price min for PRODUIT_CUSTOMER_PRICES
|
2021-02-02 13:43:33 +01:00 |
|
Laurent Destailleur
|
044b4eee48
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
htdocs/expedition/list.php
|
2021-01-31 11:54:45 +01:00 |
|
Laurent Destailleur
|
244ee05a9c
|
FIX #14290 #15900
|
2021-01-30 18:09:13 +01:00 |
|
Laurent Destailleur
|
79c68c6132
|
Merge branch '12.0' of https://github.com/dolibarr/dolibarr into 13.0
Conflicts:
htdocs/commande/stats/index.php
|
2021-01-28 00:23:44 +01:00 |
|
Laurent Destailleur
|
2be157c91f
|
Trans
|
2021-01-28 00:18:11 +01:00 |
|
Laurent Destailleur
|
cac7fdd058
|
Look and feel v13
|
2021-01-15 14:02:18 +01:00 |
|
Laurent Destailleur
|
bcfe03216a
|
FIX error managent and db transaction balance
|
2021-01-14 19:15:54 +01:00 |
|
Laurent Destailleur
|
0d704b0714
|
FIX error managent and db transaction balance
|
2021-01-14 19:09:57 +01:00 |
|
Laurent Destailleur
|
8debb58f7c
|
Fix rounding of currency unit prices
|
2021-01-11 13:36:53 +01:00 |
|
Laurent Destailleur
|
16253a79ee
|
FIX GETPOST of qty with wrong parameters
Conflicts:
htdocs/bom/bom_card.php
|
2021-01-11 13:11:40 +01:00 |
|
Laurent Destailleur
|
5e92ed0dcd
|
Fix load lang
|
2021-01-05 10:44:28 +01:00 |
|
Laurent Destailleur
|
7b3ed7301d
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
htdocs/compta/facture/class/facture-rec.class.php
htdocs/fichinter/class/fichinterrec.class.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/supplier_proposal/class/supplier_proposal.class.php
|
2021-01-02 17:01:03 +01:00 |
|
Laurent Destailleur
|
fd4dab495f
|
FIX Bad cleaning of VAT rate when numbers are into code
|
2021-01-02 16:51:34 +01:00 |
|
Laurent Destailleur
|
ce0abd17fe
|
Debug v13
|
2021-01-02 16:18:16 +01:00 |
|
Laurent Destailleur
|
bac2ae0d5f
|
Fix warnings
|
2020-12-22 17:33:17 +01:00 |
|
Laurent Destailleur
|
2e02f50993
|
css
|
2020-12-17 12:29:52 +01:00 |
|
Laurent Destailleur
|
1b69b1c2fe
|
Fix phpcs
|
2020-12-16 10:39:10 +01:00 |
|
Laurent Destailleur
|
69061e422b
|
Removed warning
|
2020-12-16 02:44:48 +01:00 |
|
Laurent Destailleur
|
b991badb8c
|
Fix warning
|
2020-12-14 13:03:43 +01:00 |
|
Laurent Destailleur
|
acb73966f7
|
Clean code. Removed phpexcel library.
|
2020-12-13 16:27:44 +01:00 |
|
Laurent Destailleur
|
3d33d3aa3a
|
Fix warning
|
2020-12-13 14:36:00 +01:00 |
|
Laurent Destailleur
|
2592344601
|
Fix missing price2num
|
2020-12-12 17:27:27 +01:00 |
|
Florian HENRY
|
2a2b372ba9
|
fix: manage price min for PRICE PER CUSTOMER
|
2020-12-10 15:08:36 +01:00 |
|
Laurent Destailleur
|
67425abd29
|
Merge pull request #15602 from c3do/patch-18
API orders: Update demand reason on order update
|
2020-12-04 19:43:43 +01:00 |
|
Laurent Destailleur
|
040d22ef0a
|
Fix phpcs
|
2020-12-04 01:59:47 +01:00 |
|
Laurent Destailleur
|
a1428c963b
|
Fix phpcs
|
2020-12-03 16:53:26 +01:00 |
|
Laurent Destailleur
|
56d56929ec
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/system/dolibarr.php
|
2020-12-03 16:39:22 +01:00 |
|
stickler-ci
|
9875e73ee2
|
Fixing style errors.
|
2020-12-03 15:04:48 +00:00 |
|
Cédric
|
2751d5cefd
|
Update api_orders.class.php
|
2020-12-03 16:02:49 +01:00 |
|
Cédric
|
dcc3ecf012
|
Update commande.class.php
|
2020-12-03 16:01:17 +01:00 |
|
Laurent Destailleur
|
d8d825f615
|
FIX #15519
|
2020-12-03 14:40:14 +01:00 |
|
Laurent Destailleur
|
068587fcee
|
Update card.php
|
2020-12-03 14:30:07 +01:00 |
|
Florian Mortgat
|
17d5bb5cd4
|
FIX 12.0 - error when displaying lines on order after adding a line if both MAIN_MULTILANGS and MAIN_DISABLE_PDF_AUTOUPDATE are activated
|
2020-12-02 22:25:08 +01:00 |
|
Cédric
|
7788157b19
|
API orders: Update demand reason on order update
|
2020-12-01 16:55:43 +01:00 |
|
Scrutinizer Auto-Fixer
|
6df4954b20
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-12-01 01:41:19 +00:00 |
|
Laurent Destailleur
|
958893228a
|
Fix combo to add contact and status of contact on popup
|
2020-11-30 15:18:58 +01:00 |
|
Laurent Destailleur
|
a2ede3573e
|
Default selected columns
|
2020-11-30 08:46:58 +01:00 |
|
Laurent Destailleur
|
6ad7cca647
|
Fix sort columns
|
2020-11-30 08:45:16 +01:00 |
|
Laurent Destailleur
|
7634212811
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/system/phpinfo.php
htdocs/commande/stats/index.php
htdocs/compta/facture/stats/index.php
|
2020-11-29 21:35:03 +01:00 |
|
Laurent Destailleur
|
d3a2aa664f
|
FIX #15572
|
2020-11-29 20:27:40 +01:00 |
|
Laurent Destailleur
|
59b445a103
|
Clean dead code
|
2020-11-28 14:47:39 +01:00 |
|
Laurent Destailleur
|
574919de52
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
.travis.yml
htdocs/accountancy/bookkeeping/balance.php
htdocs/adherents/class/subscription.class.php
htdocs/compta/bank/categ.php
htdocs/compta/facture/class/facture.class.php
htdocs/core/boxes/box_task.php
htdocs/core/class/commondocgenerator.class.php
htdocs/core/class/interfaces.class.php
htdocs/core/lib/project.lib.php
htdocs/core/modules/modCategorie.class.php
htdocs/expensereport/class/expensereport.class.php
htdocs/fichinter/class/fichinterrec.class.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/install/repair.php
htdocs/main.inc.php
htdocs/product/price.php
htdocs/projet/tasks/time.php
htdocs/reception/card.php
|
2020-11-27 15:45:12 +01:00 |
|