Laurent Destailleur
|
4de50da0dd
|
Repare code to forbidden var_dump() into code
|
2022-05-17 14:55:38 +02:00 |
|
Laurent Destailleur
|
508cbee1a5
|
Fix php8
|
2022-05-15 22:29:19 +02:00 |
|
amarchal
|
d21f5eca83
|
add hidden option SUPPLIER_ORDER_ALLOW_NEGATIVE_QTY_FOR_SUPPLIER_ORDER_RETURN
|
2022-05-09 20:13:06 +02:00 |
|
Laurent Destailleur
|
42f82486da
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2022-04-09 00:59:19 +02:00 |
|
Gauthier PC portable 024
|
83e8e07416
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/addline_with_position_choice_develop
|
2022-04-08 09:25:08 +02:00 |
|
Laurent Destailleur
|
26c3e235cf
|
Merge pull request #19459 from frederic34/productmerge
can merge products
|
2022-04-07 15:02:03 +02:00 |
|
Laurent Destailleur
|
5b91ae062f
|
All triggers with a name XXX_UPDATE have been renamed XXX_MODIFY for
code consistency purpose.
|
2022-04-02 10:31:58 +02:00 |
|
Laurent Destailleur
|
95dc25587c
|
Standardize code of the fetch_lines()
|
2022-03-28 13:50:47 +02:00 |
|
Laurent Destailleur
|
bc938d86ba
|
NEW Can enter price with tax for predefined products on purchase objects
|
2022-03-26 11:22:54 +01:00 |
|
Laurent Destailleur
|
08bc2a7ac0
|
Better modulebuilder design pattern
|
2022-03-24 19:27:42 +01:00 |
|
Laurent Destailleur
|
4a80f35aaa
|
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/fourn/class/fournisseur.commande.class.php
|
2022-03-23 17:26:25 +01:00 |
|
Ferran Marcet
|
ccf8b01020
|
Fix: The origin of the stock movement is not being recorded
|
2022-03-22 13:46:55 +01:00 |
|
Laurent Destailleur
|
167df9593b
|
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
Conflicts:
htdocs/comm/action/card.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/langs/en_US/products.lang
htdocs/reception/class/reception.class.php
|
2022-03-17 19:08:51 +01:00 |
|
Laurent Destailleur
|
e46ee982ec
|
FIX Option to manage packaging. FIX size/length/volume of reception
Conflicts:
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/install/mysql/migration/14.0.0-15.0.0.sql
htdocs/langs/en_US/products.lang
htdocs/reception/card.php
htdocs/reception/class/reception.class.php
|
2022-03-17 19:00:19 +01:00 |
|
Laurent Destailleur
|
5d415b183e
|
FIX Option to manage packaging. FIX size/length/volume of reception
|
2022-03-17 18:53:50 +01:00 |
|
Gauthier PC portable 024
|
5b715978e4
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/addline_with_position_choice_develop
|
2022-03-10 10:02:57 +01:00 |
|
Laurent Destailleur
|
893e1571b8
|
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2022-03-04 22:43:35 +01:00 |
|
Laurent Destailleur
|
c45d6a3bc7
|
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
|
2022-03-04 19:45:02 +01:00 |
|
Laurent Destailleur
|
444abbbc0e
|
Fix regression
|
2022-03-04 16:44:33 +01:00 |
|
Frédéric FRANCE
|
b277ab9ee3
|
Merge remote-tracking branch 'upstream/develop' into productmerge
|
2022-02-22 21:49:17 +01:00 |
|
Henry
|
bb08341dc3
|
to disable the default pdf generation
|
2022-02-17 18:34:23 +08:00 |
|
Frédéric FRANCE
|
eb77f10d7b
|
Merge remote-tracking branch 'upstream/develop' into productmerge
|
2022-02-15 19:11:24 +01:00 |
|
Frédéric FRANCE
|
a613553f37
|
Merge branch 'hookgetnomurl' into patch-1
|
2022-02-15 18:44:06 +01:00 |
|
Frédéric FRANCE
|
0ba912b1e5
|
add missing global
|
2022-02-15 18:14:44 +01:00 |
|
Frédéric FRANCE
|
11fc0da398
|
Update fournisseur.commande.class.php
|
2022-02-15 11:00:05 +01:00 |
|
Laurent Destailleur
|
9ba998e3ba
|
Fix some regressions
|
2022-02-10 19:36:33 +01:00 |
|
Laurent Destailleur
|
a295725368
|
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
|
2022-02-10 11:23:45 +01:00 |
|
Laurent Destailleur
|
6c8fafddf6
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
htdocs/fourn/class/fournisseur.commande.class.php
|
2022-02-10 11:22:31 +01:00 |
|
Laurent Destailleur
|
7a1c4172a6
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
htdocs/fourn/class/fournisseur.commande.class.php
|
2022-02-10 11:20:09 +01:00 |
|
Laurent Destailleur
|
793e43c7c6
|
Update fournisseur.commande.class.php
|
2022-02-10 09:29:11 +01:00 |
|
noec764
|
d9bac75a63
|
Merge branch '12.0' into 12.0_Fix_Double_CommandeFournisseurDet
|
2022-02-09 15:33:45 +01:00 |
|
Noé Courtier
|
e4c1978e12
|
Change of SQL request when fetching CommandeFournisseurLigne
|
2022-02-09 12:24:33 +01:00 |
|
Gauthier PC portable 024
|
3abe391f65
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/addline_with_position_choice_develop
|
2022-01-28 15:08:02 +01:00 |
|
Laurent Destailleur
|
0ee0bfed85
|
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
Conflicts:
htdocs/fourn/commande/card.php
test/phpunit/testvirus.txt
|
2022-01-23 13:04:37 +01:00 |
|
stickler-ci
|
400d28238c
|
Fixing style errors.
|
2022-01-20 00:09:52 +00:00 |
|
Cserveny, Tamás
|
115f022ae9
|
Check if the lines in create is type object (like supplier invoice)
|
2022-01-20 00:55:52 +01:00 |
|
Francis Appels
|
d4adeba1fc
|
FIX: origin missing for supplier order dispatchProduct
|
2022-01-18 16:22:41 +01:00 |
|
Gauthier PC portable 024
|
6799d48944
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/addline_with_position_choice_develop
|
2022-01-11 09:59:25 +01:00 |
|
Laurent Destailleur
|
423a4ea104
|
Debug v15
|
2022-01-09 19:48:38 +01:00 |
|
Frédéric FRANCE
|
d601f62194
|
can merge products but experimental
|
2021-11-23 21:38:29 +01:00 |
|
Gauthier PC portable 024
|
2c2f456827
|
Merge branch 'NEW/addline_with_position_choice' of github.com:atm-gauthier/dolibarr into NEW/addline_with_position_choice_develop
|
2021-11-23 11:10:01 +01:00 |
|
Gauthier PC portable 024
|
74f5c092dc
|
FIX : use $linecount = count($this->lines);
|
2021-11-23 10:44:43 +01:00 |
|
Frédéric FRANCE
|
dc3bfcfb87
|
can modify tooltip by reference
|
2021-11-22 19:57:26 +01:00 |
|
Gauthier PC portable 024
|
e02405edc9
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/addline_with_position_choice_develop
|
2021-11-22 16:23:26 +01:00 |
|
Laurent Destailleur
|
63cd06394f
|
Debug permission on supplier order.
Fix #huntr58ddbd8a-0faf-4b3f-aec9-5850bb19ab67
|
2021-11-20 15:41:31 +01:00 |
|
Laurent Destailleur
|
48d7378282
|
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
ChangeLog
htdocs/comm/action/card.php
htdocs/core/lib/functions.lib.php
htdocs/filefunc.inc.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/langs/ar_IQ/bills.lang
htdocs/langs/ar_IQ/cashdesk.lang
htdocs/langs/ar_IQ/modulebuilder.lang
htdocs/langs/ar_IQ/partnership.lang
htdocs/langs/ar_IQ/propal.lang
htdocs/langs/ar_IQ/stocks.lang
htdocs/langs/ar_IQ/ticket.lang
htdocs/langs/en_AE/admin.lang
htdocs/langs/en_US/receptions.lang
htdocs/langs/en_ZA/admin.lang
htdocs/product/stock/class/mouvementstock.class.php
htdocs/reception/class/reception.class.php
|
2021-11-19 23:14:39 +01:00 |
|
Laurent Destailleur
|
635e9e9747
|
CSS
|
2021-11-19 22:28:20 +01:00 |
|
Laurent Destailleur
|
271f42e761
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
htdocs/expedition/class/expedition.class.php
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/societe/list.php
|
2021-11-19 10:06:35 +01:00 |
|
Laurent Destailleur
|
e7a4f04da4
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
htdocs/expedition/class/expedition.class.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/class/fournisseur.facture.class.php
|
2021-11-18 21:41:12 +01:00 |
|
Gauthier PC portable 024
|
72614ecc0d
|
Merge branch 'NEW/addline_with_position_choice_develop' of github.com:atm-gauthier/dolibarr into NEW/addline_with_position_choice_develop
|
2021-11-16 16:43:01 +01:00 |
|
Gauthier PC portable 024
|
375dcf7028
|
FIX : dev name
|
2021-11-16 16:42:48 +01:00 |
|
stickler-ci
|
19171d4f8e
|
Fixing style errors.
|
2021-11-16 15:15:55 +00:00 |
|
Gauthier PC portable 024
|
9d41c1390d
|
Merge branch 'NEW/addline_with_position_choice' of github.com:atm-gauthier/dolibarr into NEW/addline_with_position_choice_develop
|
2021-11-16 14:20:24 +01:00 |
|
Gauthier PC portable 024
|
1e0d7d92a9
|
NEW : addline with position choice when MAIN_VIEW_LINE_NUMBER is enabled
|
2021-11-16 14:09:18 +01:00 |
|
Ferran Marcet
|
7af883abc1
|
Fix: Bad date conversion
|
2021-11-15 16:43:54 +01:00 |
|
Laurent Destailleur
|
f2bfa8b2a1
|
Merge pull request #18940 from PyroShape/develop2
NEW : info of number of product still to dispatched in a supplier order
|
2021-11-15 13:58:43 +01:00 |
|
Laurent Destailleur
|
dd2207d6c5
|
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/accountancy/customer/list.php
htdocs/core/db/DoliDB.class.php
htdocs/resource/list.php
|
2021-11-06 21:11:05 +01:00 |
|
kamel
|
82b7f0e9e4
|
FIX second approval back in stable feature as is the setting for minimum amount (last part from PR#14286)
|
2021-11-02 15:21:14 +01:00 |
|
Benjamin Chantalat
|
5be40b926b
|
Clean function not use anymore
|
2021-11-01 19:56:24 +01:00 |
|
Laurent Destailleur
|
d891dd8ddc
|
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/langs/en_US/stocks.lang
htdocs/product/stats/card.php
htdocs/projet/element.php
htdocs/salaries/card.php
|
2021-10-31 16:19:10 +01:00 |
|
Florian HENRY
|
9d15a7a18c
|
fix: warning on delete wupplier order
|
2021-10-28 17:37:30 +02:00 |
|
Frédéric FRANCE
|
46c4f28478
|
fix multiple warnings
|
2021-10-22 22:15:59 +02:00 |
|
Laurent Destailleur
|
f8010dfcbc
|
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
ChangeLog
htdocs/reception/list.php
htdocs/takepos/pay.php
|
2021-10-16 13:01:03 +02:00 |
|
Laurent Destailleur
|
b43dcb24f0
|
Update fournisseur.commande.class.php
|
2021-10-11 11:04:21 +02:00 |
|
Benjamin Chantalat
|
a7563ff62e
|
Fix : Found non quoted or not casted var into sql request
|
2021-10-10 21:15:14 +02:00 |
|
stickler-ci
|
73bd05606c
|
Fixing style errors.
|
2021-10-10 18:53:22 +00:00 |
|
Benjamin Chantalat
|
65c0167d07
|
ADD : info of number of product still to dispatched in a supplier order
|
2021-10-10 20:50:51 +02:00 |
|
Benjamin Chantalat
|
6e60e1f453
|
Fix date format into supplier order info tab
|
2021-10-09 20:38:46 +02:00 |
|
Benjamin Chantalat
|
5623e5f98a
|
Correct isset
|
2021-09-26 19:09:09 +02:00 |
|
Benjamin Chantalat
|
5cf90d0247
|
Correct date format
|
2021-09-24 14:10:19 +02:00 |
|
Benjamin Chantalat
|
c1e1a53503
|
Update Explicit date_creation instead of date
|
2021-09-23 13:23:16 +02:00 |
|
Benjamin Chantalat
|
5035ad9be1
|
Explicit date_creation instead of date
|
2021-09-15 12:32:18 +02:00 |
|
Laurent Destailleur
|
ee066ad725
|
Cast sql var
|
2021-09-03 21:25:43 +02:00 |
|
Laurent Destailleur
|
2dd91bf312
|
Clean code
|
2021-08-27 23:36:06 +02:00 |
|
Laurent Destailleur
|
46d993c9a6
|
Clean code
|
2021-08-27 22:42:04 +02:00 |
|
Laurent Destailleur
|
3b6559b1a6
|
Clean code by adding cast int.
|
2021-08-27 18:53:45 +02:00 |
|
Laurent Destailleur
|
dc006b0ebb
|
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/class/html.form.class.php
|
2021-08-23 19:44:02 +02:00 |
|
Laurent Destailleur
|
8485fee5f9
|
Cast numeric into on sql request
|
2021-08-23 19:33:24 +02:00 |
|
Laurent Destailleur
|
23829ae637
|
Cast numeric into on sql request
|
2021-08-23 18:56:46 +02:00 |
|
Laurent Destailleur
|
d4b5ee6c85
|
Fix cast into variable into sql request.
|
2021-08-23 17:41:11 +02:00 |
|
Laurent Destailleur
|
d7317025e9
|
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/pdf_other.php
|
2021-08-11 22:09:05 +02:00 |
|
Laurent Destailleur
|
ef4468153d
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
htdocs/core/class/commonobject.class.php
htdocs/core/tpl/extrafields_list_search_sql.tpl.php
htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
htdocs/fourn/class/fournisseur.commande.class.php
|
2021-08-11 22:07:13 +02:00 |
|
Laurent Destailleur
|
0cf2164260
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
htdocs/fourn/class/fournisseur.commande.class.php
|
2021-08-11 21:15:30 +02:00 |
|
Gauthier PC portable 024
|
087e269103
|
FIX : on supplier order, JOIN with product fourn price table must be done with fk_soc too to avoid display several times a same line (because of same supplier product ref)
|
2021-08-10 17:34:47 +02:00 |
|
Josep Lluís
|
20f347cd4c
|
Add missing line product variables
Add missing line product variables: product_tobatch and product_barcode
|
2021-07-20 07:07:01 +02:00 |
|
lmarcouiller
|
2a30c699ac
|
Fix #18063 : search filter status lost "Back to list"
|
2021-07-02 16:05:28 +02:00 |
|
Laurent Destailleur
|
5cc86d2319
|
Fix #yogosha6370
|
2021-06-14 13:51:09 +02:00 |
|
Laurent Destailleur
|
fb46ece906
|
Fix yogosha 6347
|
2021-06-09 15:36:47 +02:00 |
|
Laurent Destailleur
|
703001c625
|
Merge pull request #17532 from ibuiv/ibuiv-status-suppliers-hooks
New Hooks to rename Supplier Orders statuses
|
2021-06-05 02:11:29 +02:00 |
|
Laurent Destailleur
|
f0118183c8
|
Clean code
|
2021-06-05 01:11:05 +02:00 |
|
Laurent Destailleur
|
6ae4a75ac2
|
Update fournisseur.commande.class.php
|
2021-06-05 01:04:09 +02:00 |
|
Laurent Destailleur
|
cc1f98329d
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/dict.php
htdocs/product/stock/replenish.php
htdocs/ticket/card.php
htdocs/user/class/api_users.class.php
|
2021-05-17 19:50:10 +02:00 |
|
Antonin MARCHAL
|
779c868eae
|
fix mistake and removed hookmanager unused
|
2021-05-17 13:48:21 +02:00 |
|
Antonin MARCHAL
|
c6aa078892
|
renamed LibStatut hook + removed useless hook
|
2021-05-17 13:46:01 +02:00 |
|
Francis Appels
|
c3bea1b46e
|
Fix: Add test to delete supplier order if reception exist
|
2021-05-17 12:00:56 +02:00 |
|
Laurent Destailleur
|
b2ba1f5540
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
htdocs/admin/dict.php
htdocs/product/stock/replenish.php
|
2021-05-17 10:47:00 +02:00 |
|
stickler-ci
|
ea0d860593
|
Fixing style errors.
|
2021-05-12 14:55:32 +00:00 |
|
Antonin MARCHAL
|
1bfcfc3a0c
|
rename Hook and moved it into LibStatut method
|
2021-05-12 16:55:03 +02:00 |
|
Antonin MARCHAL
|
9ab12e2455
|
add (getNomUrl)
|
2021-05-07 17:06:53 +02:00 |
|
Laurent Destailleur
|
d0cc64479d
|
Fix protect sql
|
2021-04-24 20:18:11 +02:00 |
|
Laurent Destailleur
|
7e4dcde089
|
Merge pull request #17257 from ibuiv/patch-4
Fix Infinite Loop in trigger
|
2021-04-13 23:01:28 +02:00 |
|
Laurent Destailleur
|
1c8a2ce15a
|
Fix phpcs
|
2021-04-13 22:12:47 +02:00 |
|
Laurent Destailleur
|
97292d6843
|
Fix phpcs
|
2021-04-13 20:28:25 +02:00 |
|
stickler-ci
|
0511d5848e
|
Fixing style errors.
|
2021-04-13 18:24:18 +00:00 |
|
ibuiv
|
2a391dc13f
|
Fix Loop in trigger with CommandeFournisseur::createFromClone
added param $notrigger to avoid an infinite loop when createFromClone calls create
|
2021-04-13 20:19:02 +02:00 |
|
Alexandre SPANGARO
|
fb221a0541
|
Add right supplier_order
|
2021-04-12 09:59:03 +02:00 |
|
Alexandre SPANGARO
|
8d72448f43
|
Add right supplier_order
|
2021-04-12 09:47:16 +02:00 |
|
Alexandre SPANGARO
|
2d77b9bdf0
|
Work on split module fournisseur
|
2021-04-12 06:15:47 +02:00 |
|
Laurent Destailleur
|
280d534b7a
|
Fix phpcs
|
2021-04-10 00:29:32 +02:00 |
|
Laurent Destailleur
|
42ddb6e5f0
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/comm/index.php
htdocs/core/class/html.form.class.php
htdocs/core/lib/accounting.lib.php
htdocs/core/lib/website2.lib.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/class/paiementfourn.class.php
htdocs/public/ticket/view.php
|
2021-04-09 14:17:41 +02:00 |
|
Laurent Destailleur
|
f5881c6199
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
htdocs/comm/index.php
htdocs/fourn/class/fournisseur.commande.class.php
|
2021-04-09 14:02:14 +02:00 |
|
Marc de Lima Lucio
|
7df09b6e9e
|
FIX: esupplier order: error 500 when using packaging with product where it is not defined
|
2021-04-07 10:41:36 +02:00 |
|
Laurent Destailleur
|
fb84608586
|
Clean sql
|
2021-03-30 03:37:54 +02:00 |
|
Laurent Destailleur
|
3a4bb69c05
|
FIX #yogosha5749
|
2021-03-29 15:32:09 +02:00 |
|
Laurent Destailleur
|
39849de96e
|
Look and feel v14
|
2021-03-16 10:19:56 +01:00 |
|
Laurent Destailleur
|
cc10106a21
|
Fix protection on int
|
2021-03-14 12:20:23 +01:00 |
|
Laurent Destailleur
|
12f50a76d7
|
Fix yogosha #5627
|
2021-03-14 11:48:39 +01:00 |
|
Frédéric FRANCE
|
6823eabe63
|
add update CommandeFournisseur for api use
|
2021-02-27 10:10:28 +01:00 |
|
Frédéric FRANCE
|
ed6d2376f1
|
code syntax fourn directory
|
2021-02-25 23:21:30 +01:00 |
|
Alexandre SPANGARO
|
ddea3f8a92
|
Code enhanced - Standardize field name #14697
|
2021-02-21 21:47:26 +01:00 |
|
Laurent Destailleur
|
026259ebd7
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/comm/propal/list.php
htdocs/core/class/html.form.class.php
htdocs/core/lib/ajax.lib.php
htdocs/core/tpl/objectline_create.tpl.php
htdocs/product/fournisseurs.php
|
2021-02-15 13:12:27 +01:00 |
|
lmarcouiller
|
b83b5e0a42
|
Fix format error in graph in fourn/commande/index.php
|
2021-02-11 15:36:11 +01:00 |
|
Laurent Destailleur
|
09629d32d7
|
Fix missing properties in fetch
|
2021-02-11 14:53:29 +01:00 |
|
Laurent Destailleur
|
408aefd46c
|
FIX vat value when code contains number
|
2021-02-10 01:10:31 +01:00 |
|
Laurent Destailleur
|
e1af57f540
|
FIX status late on purchase orders
|
2021-02-09 20:46:17 +01:00 |
|
Laurent Destailleur
|
92942870dc
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
htdocs/fourn/class/fournisseur.commande.class.php
|
2021-02-03 17:12:44 +01:00 |
|
Laurent Destailleur
|
8b6de8fe26
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
|
2021-02-03 17:09:56 +01:00 |
|
Laurent Destailleur
|
6ab723e85c
|
Fix bad path of include
|
2021-02-03 17:09:26 +01:00 |
|
Laurent Destailleur
|
3801dd34cd
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
htdocs/core/class/extrafields.class.php
htdocs/fourn/class/fournisseur.commande.class.php
|
2021-01-31 19:02:57 +01:00 |
|
Laurent Destailleur
|
d023afb66f
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
|
2021-01-31 18:55:11 +01:00 |
|
Laurent Destailleur
|
08aa3eac00
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
htdocs/fourn/class/fournisseur.commande.class.php
|
2021-01-31 18:54:19 +01:00 |
|
Laurent Destailleur
|
9ef5f26624
|
Merge pull request #14022 from OPEN-DSI/fix_supplier_order_dispatching
FIX: Fix detect dispatched product and set to received completely when the supplier order have services
|
2021-01-31 18:51:57 +01:00 |
|
Laurent Destailleur
|
0d704b0714
|
FIX error managent and db transaction balance
|
2021-01-14 19:09:57 +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
|
bac2ae0d5f
|
Fix warnings
|
2020-12-22 17:33:17 +01:00 |
|
Laurent Destailleur
|
a67068ab7b
|
Fix warnings
|
2020-12-17 18:08:56 +01:00 |
|
Laurent Destailleur
|
eed14bd9af
|
Fix warnings
|
2020-12-17 17:04:42 +01:00 |
|
Laurent Destailleur
|
b991badb8c
|
Fix warning
|
2020-12-14 13:03:43 +01:00 |
|
Frédéric FRANCE
|
4e18f46f28
|
doxygen
|
2020-12-05 23:53:55 +01:00 |
|
Florian HENRY
|
94d57cd462
|
fix rounding
|
2020-12-04 10:03:06 +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
|
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 |
|
Laurent Destailleur
|
ac3c129735
|
Clean code
|
2020-11-27 14:24:15 +01:00 |
|
Laurent Destailleur
|
c994b3b6f2
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/fourn/class/fournisseur.commande.class.php
|
2020-11-26 17:02:19 +01:00 |
|
Laurent Destailleur
|
22c2cfd9ec
|
FIX warning for purchase order delivery late.
|
2020-11-26 16:57:39 +01:00 |
|
Laurent Destailleur
|
bd780a8c51
|
FIX Warning on late purchase order delivery
|
2020-11-26 15:29:18 +01:00 |
|
Laurent Destailleur
|
3d2da45f84
|
Remove warning
|
2020-11-22 11:36:07 +01:00 |
|
Laurent Destailleur
|
1a21ace02d
|
Update fournisseur.commande.class.php
|
2020-11-18 12:42:33 +01:00 |
|