fappels
574590a598
Add minimum qty column
2017-06-30 10:55:45 +02:00
fappels
d0599cd952
Revert "WAP alway decimal 2 digits"
...
This reverts commit 7d4a093d9e
2017-06-30 10:54:04 +02:00
fappels
7d4a093d9e
WAP alway decimal 2 digits
2017-06-30 10:52:54 +02:00
fappels
e3f7402e07
Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop_nbr_suppliers_prod_list
2017-06-26 22:45:18 +02:00
fappels
13e5c8ff7a
Create patch
...
Add Number of supplier prices and wap columns
2017-06-26 22:44:56 +02:00
Regis Houssin
3445c9d329
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/core/lib/functions.lib.php
2017-06-11 06:27:49 +02:00
atm-ph
039130c694
Fix travis
2017-06-10 16:19:33 +02:00
atm-ph
5dfb988cb1
Fix 6944 compatibility PHP7 and missing parameter to call delete function
2017-06-10 13:34:28 +02:00
Regis Houssin
fa58f0f3e8
Fix: add entity filter
2017-06-09 09:25:15 +02:00
Regis Houssin
5c5663c5ae
New: getEntity function use true $shared value by default
2017-05-30 18:50:54 +02:00
Maxime Kohlhaas
6ac08c3bee
Fix : Product supplier price is related to supplier's currency
2017-05-29 10:32:17 +02:00
Laurent Destailleur
f5e29d6c86
Fix phpcs warning
2017-05-22 10:45:02 +02:00
Laurent Destailleur
e2a7b0943f
Clean dead code
2017-05-17 14:52:27 +02:00
Laurent Destailleur
fa290c34fa
Fix against SQL injection. Add phpunit to detect missing escapement.
2017-05-12 16:55:11 +02:00
Benoit
23af50ad2a
Add fk_facture_fourn element to fetch lines objects
2017-05-10 22:45:41 +02:00
Benoit
0fbf27895a
Add fk_facture_fourn element to fetch lines objects
2017-05-05 22:33:34 +02:00
Laurent Destailleur
11b1a2adac
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/journal/bankjournal.php
htdocs/accountancy/journal/expensereportsjournal.php
htdocs/accountancy/journal/purchasesjournal.php
htdocs/accountancy/journal/sellsjournal.php
htdocs/comm/propal/class/api_proposals.class.php
htdocs/comm/propal/class/propal.class.php
htdocs/compta/bank/index.php
htdocs/compta/facture.php
htdocs/core/class/html.form.class.php
htdocs/includes/odtphp/Segment.php
htdocs/langs/en_US/admin.lang
htdocs/societe/soc.php
2017-05-05 14:49:25 +02:00
Laurent Destailleur
2120b9af85
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/core/class/commonobject.class.php
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/theme/eldy/style.css.php
2017-05-05 14:14:21 +02:00
Laurent Destailleur
8a37eeea74
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
2017-05-05 14:02:02 +02:00
Guillaume T. (Arck Consulting)
ef0d395a1a
[FIX] Credit Note for fourn doesn't work, missing filed in create method & attribut
2017-05-05 09:49:44 +02:00
Laurent Destailleur
ce05c74e47
NEW SUPPLIER_ORDER_EDIT_BUYINGPRICE_DURING_RECEIPT
2017-05-04 17:48:52 +02:00
Laurent Destailleur
ea58fb0b50
Fix triggered error
2017-05-04 15:52:12 +02:00
Marc de Lima Lucio
56e749df9f
FIX: supplier order line were always created with rang = 0
2017-04-26 16:12:27 +02:00
Laurent Destailleur
4c056d68d8
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/dict.php
htdocs/commande/list.php
htdocs/core/class/html.form.class.php
htdocs/langs/en_US/bills.lang
htdocs/societe/list.php
2017-04-15 17:02:05 +02:00
Laurent Destailleur
a6b05bb4da
Merge branch '5.0' of github.com:Dolibarr/dolibarr into 5.0
2017-04-12 14:08:58 +02:00
Laurent Destailleur
abf87a6946
Merge branch '4.0' into fix_reffourn
2017-04-11 11:00:35 +02:00
Laurent Destailleur
60a54041c2
NEW Enable bulk actions delete on supplier invoices
2017-04-07 14:09:19 +02:00
altatof
919633b2be
escape supplier ref
2017-04-07 12:10:01 +02:00
altatof
a6ec22d7fe
FIX: dont lose supplier ref if no supplier price in database
2017-04-07 12:06:15 +02:00
florian HENRY
7668702806
fix: missing attribute update
2017-04-07 08:56:10 +02:00
Laurent Destailleur
216bce608d
Work on v6 look and feel
2017-04-06 23:28:06 +02:00
Laurent Destailleur
3740137e31
Add tooltip on label of each open item.
2017-03-28 10:44:52 +02:00
BENKE Charlie
3299e5f889
PRODUCT_PRICE_SUPPLIER_NO_LOG test inverted
...
if PRODUCT_PRICE_SUPPLIER_NO_LOG is empty, no log is stored
if PRODUCT_PRICE_SUPPLIER_NO_LOG is not empty log is stored
they are inversion
@eldy maybe add more field in this table
2017-03-26 19:13:10 +02:00
Laurent Destailleur
106d19a8af
FIX #6468 + Fix missing translation
2017-03-25 03:53:11 +01:00
Laurent Destailleur
f241bfefd0
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-03-23 20:20:59 +01:00
Laurent Destailleur
2062047dea
Merge pull request #6555 from atm-gauthier/5.0_fix_originid_on_supplierorder
...
FIX : origin & origin id on supplier order line
2017-03-23 20:03:58 +01:00
Laurent Destailleur
3adb43c6e5
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture.php
htdocs/core/boxes/box_produits.php
htdocs/core/boxes/box_produits_alerte_stock.php
htdocs/langs/en_US/bills.lang
htdocs/product/class/product.class.php
htdocs/theme/eldy/style.css.php
htdocs/theme/md/style.css.php
2017-03-23 12:52:19 +01:00
Laurent Destailleur
7df9c25e60
Several fixes on multicurrency
2017-03-23 12:44:20 +01:00
gauthier
a790ef9f7c
FIX : origin & origin id on supplier order line
2017-03-23 12:35:43 +01:00
Laurent Destailleur
b7442a0c1a
Fix bad vat rate used into sql request
2017-03-19 15:38:07 +01:00
Laurent Destailleur
75d73b188c
Fix bad vat rate used into sql request
2017-03-19 14:51:25 +01:00
Laurent Destailleur
4831fb4dcb
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/adherents/class/adherent.class.php
htdocs/filefunc.inc.php
2017-03-19 11:26:49 +01:00
fappels
c1b21db407
Merge remote-tracking branch 'refs/remotes/Dolibarr/5.0' into 5.0_fix_fourn_commande_class
2017-03-16 10:06:20 +01:00
fappels
f9c2bb0410
Fix create supplier order line label
...
Fix create line label
Fix read line rang, special_code and fk_parent_line
Remove create line rang, done by table default and $this->rang is
invalid, supplier order has no rang property.
2017-03-16 10:05:50 +01:00
Laurent Destailleur
c72e7c1057
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/files.lib.php
2017-03-10 14:54:35 +01:00
Laurent Destailleur
427f656bac
Merge pull request #6500 from atm-florian/4.0
...
FIX : Can use quote into supplier ref on order line add
2017-03-10 12:49:36 +01:00
Laurent Destailleur
a4b6388ba1
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/fourn/class/fournisseur.commande.class.php
2017-03-10 12:35:33 +01:00
Laurent Destailleur
6977daf76a
Merge pull request #6491 from atm-gauthier/4.0_fix_supplierinvoiceline_fetch
...
FIX : forgotten fk_facture_fourn attribute on supplierinvoice line ob…
2017-03-10 12:31:20 +01:00
florian HENRY
9b10c9f6d1
FIX : Can use quote into supplier ref on order line add
2017-03-10 09:19:42 +01:00
gauthier
9eb3975803
FIX : forgotten fk_facture_fourn attribute on supplierinvoice line object
2017-03-07 15:18:20 +01:00
