Commit Graph

960 Commits

Author SHA1 Message Date
dolibarr95
14e68ea8f9 Allow qty to be negative 2018-04-26 16:42:08 +02:00
BENKE Charlene
c879232fd7 add $user on delete line
possible to hamonize the call function for all line->delete ?
2018-04-24 23:41:12 +02:00
Laurent Destailleur
5eb7c7ffff FIX Edit of ref_supplier in supplier invoice 2018-04-24 13:22:34 +02:00
Laurent Destailleur
9d070cac87 NEW Can add product in supplier order/invoice even w/o predefined price
Add option SUPPLIER_PROPOSAL_WITH_PREDEFINED_PRICES_ONLY,
SUPPLIER_ORDER_WITH_PREDEFINED_PRICES_ONLY and
SUPPLIER_INVOICE_WITH_PREDEFINED_PRICES_ONLY to restore restricted old
behaviour.
2018-04-24 12:57:31 +02:00
Laurent Destailleur
06e51703b1 Clean constructors 2018-04-21 16:01:05 +02:00
Laurent Destailleur
912d5c53f2 Standardize code 2018-04-21 15:54:05 +02:00
Laurent Destailleur
411949a6bb Optimize constructors 2018-04-21 15:08:46 +02:00
Laurent Destailleur
0d0da234b1 Lowercase NULL, TRUE, FALSE according to PSR2 2018-04-16 13:51:16 +02:00
Laurent Destailleur
2959dc4a3a Fix regression 2018-04-15 18:20:04 +02:00
florian HENRY
ad403c7045 fix syntax and uniformize code 2018-04-14 17:04:38 +02:00
Laurent Destailleur
b4ef3945d2 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/fourn/facture/card.php
2018-04-13 23:52:08 +02:00
Laurent Destailleur
6a3c2f9808 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
Conflicts:
	htdocs/fourn/facture/card.php
2018-04-13 23:27:14 +02:00
Laurent Destailleur
c25e21de4b Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-04-13 23:19:22 +02:00
Laurent Destailleur
8cfcdabcac Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
2018-04-13 23:03:46 +02:00
atm-greg
8d4126274a rang was missing on order_supplier lines 2018-04-13 15:53:49 +02:00
atm-greg
ef2c6a0ed4 fix sql error 2018-04-13 10:31:36 +02:00
atm-greg
58535993c1 use special_code on order_supplier lines 2018-04-13 10:31:27 +02:00
Laurent Destailleur
3078b890d4 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/stripe/admin/stripe.php
2018-04-13 00:45:39 +02:00
Laurent Destailleur
f7bb781b42 FIX #8571 2018-04-13 00:43:15 +02:00
Laurent Destailleur
7108f68db9 Remove old deprecated hook insertExtraFields. Triggers must be used for
action on CRUD events.
2018-04-10 12:03:01 +02:00
Laurent Destailleur
9e89675862 Fix creation of supplier invoice 2018-04-06 20:34:12 +02:00
François J
a78c064461 Fix CommandeFournisseur::getDispachedLines line ID & return quantity 2018-04-06 11:22:15 +02:00
François J
041a21e829 Add tag @since 2018-04-04 14:05:50 +02:00
François J
9b61272bb7 Fix CommandeFournisseur::getDispachedLines line ID & return quantity 2018-04-04 12:32:49 +02:00
Laurent Destailleur
64f21b8a3c Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/expensereport/card.php
2018-03-11 00:10:13 +01:00
Maxime Kohlhaas
d82c62b638 Fix supplier order clone was keeping objectlinked 2018-03-09 21:51:59 +01:00
atm-ph
53ce297ab3 Fix travis - missing documentation of new param 2018-03-09 09:30:11 +01:00
Laurent Destailleur
1c9e7145e7 Merge pull request #8276 from ATM-Consulting/develop_atm
NEW: supplier credit notes & discounts (absolute and relative)
2018-03-08 20:06:37 +01:00
Regis Houssin
93a9430e49 Fix: regression, restore primary key 2018-03-08 07:41:54 +01:00
Laurent Destailleur
cf45f78d7e Merge pull request #8218 from OPEN-DSI/product_supplier_buyprice_multicurrency
NEW Add multicurrency support for product buy price for supplier propales, orders and invoices
2018-03-07 13:12:23 +01:00
atm-ph
5971cd8e59 Fix label goes in desc and lost fourn ref 2018-03-05 17:18:03 +01:00
atm-ph
ebb4da8417 Fix keep supplier proposal price in supplier order 2018-03-05 16:58:35 +01:00
Marc de Lima Lucio
7cd1b2caa9 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_atm 2018-02-27 16:45:01 +01:00
Marc de Lima Lucio
239e834913 FIX: supplier credit notes: remove handled TODO 2018-02-27 10:04:02 +01:00
Laurent Destailleur
de89893d57 NEW Show total of time consumed in week in time spent entry page 2018-02-26 14:09:56 +01:00
kkhelifa-opendsi
90f4c985f6 Merge branch 'develop' into product_supplier_buyprice_multicurrency 2018-02-26 09:54:09 +01:00
Laurent Destailleur
003827eb06 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-02-25 15:01:19 +01:00
Laurent Destailleur
b52a2b12a5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-02-25 14:44:49 +01:00
Laurent Destailleur
2cd5ed65a6 Clean deprecated (field unit_charge in supplier price) 2018-02-25 14:13:09 +01:00
Regis Houssin
703d976b3b Fix: missing object entity in fetch 2018-02-24 16:21:16 +01:00
KHELIFA
54dba24ab5 Add multicurrency support for product buy price for supplier propales, orders and invoices 2018-02-23 11:06:07 +01:00
dolibarr95
6793d826b7 Dispatch if more than ordered
If the constant SUPPLIER_ORDER_MORE_THAN_WISHED is set
2018-02-23 10:14:54 +01:00
Laurent Destailleur
c4130730cb Clean code around fetch_optionals() 2018-02-20 19:38:18 +01:00
Laurent Destailleur
809ef1bd00 FIX Trigger *_MODIFY must be called when editing a property event extra.
Clean duplicate trigggers "*_CLONE"
2018-02-20 18:09:38 +01:00
Marc de Lima Lucio
57b8df4008 FIX: supplier credit notes: delete discount when deleting linked invoice/invoice line 2018-02-19 17:32:11 +01:00
Marc de Lima Lucio
f5ad93b272 NEW: supplier credit notes: handle Excess Paid + translation 2018-02-19 15:52:07 +01:00
Marc de Lima Lucio
e2b65b3755 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_supplier_credit_note 2018-02-16 09:14:53 +01:00
Marc de Lima Lucio
daca27b2ed NEW: supplier credit notes: split display in thirdparty discount page + fixes + refactoring 2018-02-14 18:02:40 +01:00
Laurent Destailleur
536eb7e008 Fix label of invoice 2018-02-14 17:25:13 +01:00
Marc de Lima Lucio
4f9bb33600 NEW: supplier credit notes: convert to usable absolute discount + link/unlink to supplier invoice + create supplier credit note from excess paid 2018-02-14 10:47:10 +01:00