Regis Houssin
1522a5b22d
Fix: differentiate customer prices from supplier prices sharing
2018-07-07 08:43:59 +02:00
Laurent Destailleur
07c514b85c
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/fourn/class/fournisseur.product.class.php
htdocs/projet/class/projectstats.class.php
2018-06-20 21:56:10 +02:00
Laurent Destailleur
9f2437fa04
Fix missing field
2018-06-20 17:59:01 +02:00
jean
1ab5eece6b
Adding code to show update date of supplier price shown
2018-05-22 09:40:49 +02:00
kkhelifa-opendsi
90f4c985f6
Merge branch 'develop' into product_supplier_buyprice_multicurrency
2018-02-26 09:54:09 +01:00
Laurent Destailleur
2cd5ed65a6
Clean deprecated (field unit_charge in supplier price)
2018-02-25 14:13:09 +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
Laurent Destailleur
e79f6fda2b
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-01-26 01:23:18 +01:00
Laurent Destailleur
2c0eeaf8de
FIX #8093
2018-01-25 20:57:51 +01:00
Ion
e95ee4b878
Fix old parseProductSupplier call
2017-11-10 12:32:54 +01:00
Laurent Destailleur
5482f80c0e
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-09-26 10:30:47 +02:00
Laurent Destailleur
59571b1ce1
FIX #7473 Mass update of vat rates and other bugs on localtax
2017-09-26 10:29:44 +02:00
Laurent Destailleur
681623c3ab
Merge branch 'develop' into patch-1
2017-08-22 11:43:25 +02:00
Laurent Destailleur
206d46cbb7
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
...
Conflicts:
scripts/cron/cron_run_jobs.php
2017-08-22 11:18:17 +02:00
Laurent Destailleur
41ce4886fd
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
2017-08-22 11:15:30 +02:00
fappels
ca3cdfabec
FIX Best buy price calculation
...
Best buy price also depends on buy discount.
2017-08-09 14:15:26 +02:00
Laurent Destailleur
9f486716c1
Fix phpcs
2017-07-08 14:56:43 +02:00
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
5c5663c5ae
New: getEntity function use true $shared value by default
2017-05-30 18:50:54 +02:00
Laurent Destailleur
e2a7b0943f
Clean dead code
2017-05-17 14:52:27 +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
fappels
a84c6f9b45
Qual reputation for price supplier
...
Move available reputation constants from view-controller to class
2017-02-08 13:35:34 +01:00
gauthier
7d63925118
NEW : param socid find_min_price_product_fournisseur() function
2016-10-18 15:35:48 +02:00
Frédéric FRANCE
7004dfbc15
typo
2016-06-25 09:57:46 +02:00
Laurent Destailleur
293c8e145a
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/fourn/commande/card.php
htdocs/imports/import.php
htdocs/langs/en_US/admin.lang
2016-06-05 02:20:27 +02:00
Maxime Kohlhaas
3ef9fe2c40
Fix product supplier price modification with multicompany
2016-06-04 18:10:40 +02:00
Ion Agorria
6ba86e9d03
Fill ref_supplier in product supplier price
2016-05-26 20:53:01 +02:00
Laurent Destailleur
4e46a01d51
Fix regression introduced with option SUPPLIERORDER_WITH_NOPRICEDEFINED
2016-05-17 22:59:46 +02:00
Laurent Destailleur
c795803da1
FIX ref_supplier was not set. We also refered to old var names.
2016-05-05 20:19:56 +02:00
Laurent Destailleur
8d46d76f96
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/fourn/facture/paiement.php
2016-04-12 15:05:18 +02:00
Laurent Destailleur
e61c83d708
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/fourn/facture/paiement.php
2016-04-12 15:03:19 +02:00
Laurent Destailleur
8342a61ea9
Merge remote-tracking branch 'origin/3.7' into 3.8
...
Conflicts:
htdocs/core/tpl/objectline_edit.tpl.php
htdocs/fourn/class/fournisseur.product.class.php
htdocs/fourn/facture/card.php
htdocs/product/composition/card.php
2016-04-12 15:00:02 +02:00
Christophe Battarel
791df0c9ea
FIX: correct display of minimum buying price
2016-04-11 17:27:34 +02:00
Laurent Destailleur
f8b39ab50e
Fix errors reported by scrutinizer
2016-04-09 19:04:23 +02:00
Laurent Destailleur
3827a06796
Debug the supplier ref reputation feature.
2016-04-08 22:18:36 +02:00
Alexis Algoud
61a077b0ee
NEW reputation for price supplier
2016-04-06 09:58:03 +02:00
BENKE Charlie
e455a2c9a8
only enabled society is used for product select
2016-03-07 08:25:21 +01:00
Laurent Destailleur
8807222f24
Fix a lot of fixes to have the french vat npr working better
2016-02-27 12:22:39 +01:00
Laurent Destailleur
c86a1a30d5
Fix a lot of fixes to have the french vat npr working better
2016-02-27 11:46:16 +01:00
Ion Agorria
89657d0439
Changed Price Parser functions and added testExpression
2016-02-14 17:28:31 +01:00
Ion Agorria
99efbd3464
Check if dynamic price is enabled
2016-02-14 16:09:47 +01:00
Ion Agorria
1f99ce8ae9
Fix var typo
2016-02-14 01:21:56 +01:00
Ion Agorria
1a45ab9d50
Fix missing vars in fetch_product_fournisseur_price
2016-02-11 20:29:45 +01:00
Sof
c04eef35d5
FIX: Field cost_price does not exist and typos
2015-12-28 19:07:25 +01:00
Laurent Destailleur
de730c9762
NEW Introduce cost price on product.
2015-11-30 21:20:45 +01:00
Laurent Destailleur
72915aa16d
Merge pull request #3784 from All-3kcis/develop-patch-11
...
NEW Add trigger "SUPPLIER_PRODUCT_BUYPRICE_DELETE"
2015-11-02 11:23:49 +01:00
All-3kcis
a658ff7e90
add commit or rollback if error
2015-11-02 10:26:07 +01:00
All-3kcis
00c2b1a32a
move db->begin() before trigger
2015-10-22 14:30:11 +02:00
All-3kcis
ceae04b76e
move trigger before query
2015-10-22 12:03:01 +02:00
All-3kcis
ca8c1adf55
Add trigger "SUPPLIER_PRODUCT_BUYPRICE_DELETE" for frounisseur.product remove_product_fournisseur_price()
2015-10-21 10:07:53 +02:00
All-3kcis
3cb2637f25
Correct return value
2015-10-20 09:42:02 +02:00
Laurent Destailleur
3d94e3d80e
FIX Editing a supplier price should keep the vat.
2015-10-17 12:01:17 +02:00
Laurent Destailleur
43ed48896a
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
build/debian/changelog
htdocs/filefunc.inc.php
htdocs/install/mysql/migration/3.6.0-3.7.0.sql
2015-06-05 18:31:53 +02:00
Laurent Destailleur
1252a500ce
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/fourn/class/fournisseur.product.class.php
2015-06-05 16:50:46 +02:00
jfefe
195a1b2708
FIX #2957 : missing $langs object for trigger
2015-06-04 18:10:29 +02:00
Raphaël Doursenaud
3f9270ea78
Qual: added deprecation hinting
...
Added deprecation hinting for class properties
Added syslog warning events for deprecated functions, methods and/or their parameters
Added hinting for some constants
2015-06-01 11:00:11 +02:00
Laurent Destailleur
bf883e1576
Minor cosmetic changes
...
Fix permissions and CRLF
2015-05-15 02:34:57 +02:00
Marcos García de La Fuente
e2e6049c7f
Copyright
2015-04-18 20:50:03 +02:00
Marcos García de La Fuente
dc790ff586
NEW: Feature request: A page to merge two thirdparties into one #2613
2015-04-18 20:41:09 +02:00
Laurent Destailleur
56a14da5d4
FIXME that are not bug are replaced with TODO
...
Add control on batch movement (lot/serial is mandatory, and control
eatby and sellby are same for each lot/serial)
2015-04-12 04:01:28 +02:00
Laurent Destailleur
b3355df3bf
Fix delivery delay could not be set to unknown
2015-04-08 13:00:03 +02:00
Laurent Destailleur
1efa5bcabd
Fix: Avoid duplicate tooltip
2015-04-08 12:44:11 +02:00
Laurent Destailleur
55140afde4
Merge branch 'price-global-variables' of
...
https://github.com/IonAgorria/dolibarr into
IonAgorria-price-global-variables
Conflicts:
htdocs/install/mysql/migration/3.7.0-3.8.0.sql
htdocs/product/dynamic_price/editor.php
2015-03-22 12:45:04 +01:00
Laurent Destailleur
a55af4387b
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
.travis.yml
htdocs/core/class/notify.class.php
htdocs/product/stock/class/mouvementstock.class.php
test/phpunit/AllTests.php
test/phpunit/MouvementStockTest.php
2015-03-22 12:10:39 +01:00
jean
9e9a8894ea
Add global $langs to method, necessary for triggers to function
...
correctly
2015-03-17 14:20:08 +01:00
Ion Agorria
5f9b1fa029
Changes for applying new paths
2015-03-14 16:50:02 +01:00
Laurent Destailleur
ef14e4e7ed
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/compta/facture.php
htdocs/fourn/class/fournisseur.product.class.php
2015-02-28 03:11:15 +01:00
Laurent Destailleur
d6438a51ab
Add log to help track bug
2015-02-26 15:24:15 +01:00
Laurent Destailleur
bbc82e829b
Fix bad sql request
2015-02-23 23:28:55 +01:00
Laurent Destailleur
3f807a09b4
Doxygen
2015-02-08 00:39:51 +01:00
phf
12c7e52b7e
[CORE] Fix : rename de la variable "delai_livraison_jours" en "delivery_time_days" (#deliverytime).
2015-02-06 16:33:58 +01:00
phf
35d41d6f7c
[CORE] Ajout d'un attribut (delai_livraison_jours) à l'objet ProductFournisseur, paramétrable lors d'un ajout/modification d'un prix fournisseur et s'affiche sur une commande fournisseur avec le plus grand délai parmis la liste des produits dans la commande (#deliverytime).
2015-02-06 16:07:22 +01:00
Laurent Destailleur
556c27f834
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/install/mysql/migration/3.7.0-3.8.0.sql
htdocs/product/stock/mouvement.php
2015-02-04 15:15:50 +01:00
Laurent Destailleur
9c087e27d0
Fix permissions
2015-02-02 13:45:55 +01:00
Laurent Destailleur
43702cf662
New: Enhance stock management: Introduce tag to define if a subproduct
...
must have stock decreased and add inventory code on stock movements.
2015-01-30 01:51:28 +01:00
Ion Agorria
2c01370ce6
Reimplemented 'find_min_price_product_fournisseur()'
2015-01-21 05:22:46 +01:00
Ion Agorria
5bbcb58b44
Added expressions for product/service prices
2014-12-28 01:26:41 +01:00
Laurent Destailleur
475d749a97
Fix: phpcheckstyle
2014-12-04 01:11:13 +01:00
Laurent Destailleur
1e8e4e7fda
Prepare 3.8 dev
...
Fix bad test.
Renamed table for dynamic prices.
2014-12-03 17:06:44 +01:00
Ion Agorria
fac46b3b46
Code for dinamic prices funcionality
2014-11-29 06:31:35 +01:00
Maxime Kohlhaas
a5739c248e
Fix : Product supplier prices were not working anymore due to bad SQL
2014-10-27 10:23:33 +01:00
Regis Houssin
30221ae8cf
Fix: missing fields
2014-10-02 09:00:40 +02:00
Raphaël Doursenaud
1d5fb1320b
Fix: missing global declarations
2014-08-20 19:03:58 +02:00
Florian HENRY
bab7533578
Enable supplier price log table
2014-08-12 18:16:59 +02:00
KreizIT
5093fecc60
Refactor: SUPPLIER_PRODUCT_BUYPRICE_ * trigger
2014-07-11 15:50:40 +02:00
Marcos García de La Fuente
56abf1cd72
Removed duplicated SQL error logging
2014-06-13 02:28:30 +02:00
Marcos García de La Fuente
ca0a6cb307
Removed SQL string from call debug log
2014-06-13 01:34:39 +02:00
Marcos García de La Fuente
9fbd7806f0
More substitutions
2014-06-12 11:31:53 +02:00
Laurent Destailleur
ccca46f380
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/comm/propal.php
htdocs/comm/propal/list.php
htdocs/commande/fiche.php
htdocs/compta/facture.php
htdocs/core/lib/functions.lib.php
htdocs/expedition/note.php
htdocs/fourn/commande/liste.php
htdocs/fourn/facture/fiche.php
htdocs/main.inc.php
htdocs/projet/tasks/index.php
htdocs/theme/eldy/style.css.php
2014-05-29 19:20:48 +02:00
Laurent Destailleur
ae01c785c5
Fix: Do not show ref supplier title if ref_supplier not set (currently
...
always the case with 3.5).
2014-05-25 03:57:13 +02:00
Raphaël Doursenaud
f8f502d013
Removed closing php tag
...
http://php.net/manual/en/language.basic-syntax.phptags.php
2014-05-03 18:18:44 +02:00
Laurent Destailleur
0e23892c71
More consistency trigger name
2014-04-02 15:05:03 +02:00
Raphaël Doursenaud
3b9696351e
Qual: keep trigger naming consistent
2014-04-02 12:22:38 +02:00
Christophe Battarel
fff9bc1b00
fix bad attribute name
2014-04-01 11:14:54 +02:00
Christophe Battarel
ea74c4738e
add trigger CREATE_BUYPRICE
2014-04-01 10:23:57 +02:00
geoffrey.girard
7f59def98b
Correction trigger on update product buyprice
2014-01-22 10:44:23 +01:00
geoffrey.girard
8729790016
Add trigger on update product buyprice
2014-01-17 10:38:18 +01:00
Laurent Destailleur
0e743d5024
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
ChangeLog
htdocs/adherents/admin/adherent.php
htdocs/comm/propal/class/propal.class.php
htdocs/commande/document.php
htdocs/compta/facture/class/facture.class.php
htdocs/compta/facture/list.php
htdocs/cron/card.php
htdocs/expedition/class/expedition.class.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/fourn/commande/document.php
htdocs/langs/fr_FR/admin.lang
htdocs/langs/fr_FR/cron.lang
htdocs/langs/fr_FR/projects.lang
htdocs/langs/nl_NL/admin.lang
htdocs/langs/nl_NL/categories.lang
htdocs/langs/nl_NL/commercial.lang
htdocs/langs/nl_NL/companies.lang
htdocs/langs/nl_NL/dict.lang
htdocs/langs/nl_NL/main.lang
htdocs/langs/nl_NL/margins.lang
htdocs/langs/nl_NL/products.lang
htdocs/societe/class/societe.class.php
htdocs/societe/rib.php
2013-11-19 21:08:02 +01:00
Laurent Destailleur
b911d30684
Fix: Stock into subproduct was wrong
...
New: Show best sell price and total for virtual products
2013-11-14 17:16:17 +01:00
Christophe Battarel
7dbe2bcf2c
fix wrong buy price update
2013-11-13 18:41:31 +01:00
Laurent Destailleur
c1b6e05cc0
Fix: bad sql syntax
2013-09-15 12:46:54 +02:00
Laurent Destailleur
5e969536c0
Fix: bad sql syntax
2013-09-15 12:34:22 +02:00
Raphaël Doursenaud
dcc87263d0
Update parameter as expected by the function name
2013-08-26 18:26:11 +02:00
Regis Houssin
556574cbc9
FIXME: this field not exist in llx_product_fournisseur_price
2013-04-19 13:47:30 +02:00
Laurent Destailleur
ba93a4bfe2
Fix: Codesniffer
2013-04-10 12:20:45 +02:00
Laurent Destailleur
a5f72bfb4e
Fix: Some fix after patch merge.
2013-04-05 22:38:46 +02:00
Sébastien de Chateauvieux
5921033f94
TVA NPR : Change field name recuperableonly to info_bits
2013-03-28 09:51:49 +04:00
Sébastien de Chateauvieux
b2b0d1616d
TVA NPR : add fourn_tva_npr property in class ProductFournisseur
2013-03-25 17:32:22 +04:00
Laurent Destailleur
8d206fdfb0
Prepare move to other licence. For the moment all answers for licence
...
upgrade were not yet received. So we prepare for GPL by uniformizing
licence text keys to GPL-3+. Will move later to AGPL if all answers are
positive.
2013-01-16 15:36:08 +01:00
Regis Houssin
b838895db9
Fix: change for a neutral email
2012-12-30 15:13:49 +01:00
Laurent Destailleur
5d27fd61df
Beautify instal pg.
...
Fix: Debian package
Restore PHPUnit test (A PHP Unit test that fails should not be removed
but fixed and be kept in error until fix is published. Otherwise,
PHPUnit are useless).
Conflicts:
htdocs/install/fileconf.php
htdocs/install/inc.php
2012-12-05 00:45:10 +01:00
Christophe Battarel
41541e4bc2
add charges and unitcharges in update statement
2012-10-23 10:54:35 +02:00
Christophe Battarel
8f08d7a166
add entity in the unique key for delete
2012-10-17 14:25:43 +02:00
Christophe Battarel
e8b92cc2c5
correct bug in price delete
2012-10-17 12:47:40 +02:00
Laurent Destailleur
082ee53dae
Fix: Miscellaneous fix in supplier product input
2012-10-02 00:30:23 +02:00
Maxime Kohlhaas
1d21f24fa7
Task # 559 : Add possibility to define a discount for min quantity on supplier product prices
2012-10-01 11:25:17 +02:00
Laurent Destailleur
efc61be1a4
Fix: Rounding at wrong place
2012-08-26 18:27:15 +02:00
Marcos García
706d79986c
Removed parenthesis from all require_once and replaced with single quotes
2012-08-22 23:11:24 +02:00
Laurent Destailleur
de621f0567
Fix: Restore compatibility. Try to isolate "charges" feature with
...
a condition (i did not understand what it means and goal, i'm afraid
other users should not understand too).
2012-07-25 11:32:48 +02:00
Christophe Battarel
34132de71d
add charges to supplier prices
2012-07-19 15:36:25 +02:00
Regis Houssin
66b2f630ac
Fix: big avoid strict mode errors
2012-07-09 12:31:21 +02:00
Laurent Destailleur
9114fec4ed
Doxygen
2012-04-16 12:01:32 +02:00
Regis Houssin
e8ec5f5ad7
New: add vat rate in supplier price
...
New: add events system in jquery combobox
2012-03-15 16:52:18 +01:00
Regis Houssin
e5c0a99584
Fix: for multi-company
...
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/core/class/html.form.class.php
2012-02-21 10:26:38 +01:00
Regis Houssin
cd3452d71d
Fix: multicompany sharings and uniformize code
2012-02-11 10:18:09 +01:00
Regis Houssin
4431510ce4
Fix: use entity field of object
2012-02-01 11:32:55 +01:00
eldy
822d4508eb
Qual: Removed PHPCodesniffer warnings
2011-10-05 13:13:36 +02:00
eldy
b295a866a5
Fix: Fix a serious database default. Table llx_product_fournisseur was
...
linked with llx_product_fournisseur_price with a link 1-1 so was
useless. I removed it. This reduce a lot of sophisticated code and will
make import of prices easier. This also increase speed.
2011-10-05 12:51:55 +02:00
eldy
47bb2171e0
Fix: Fix a serious database default. Table llx_product_fournisseur was
...
linked with llx_product_fournisseur_price with a link 1-1 so was
useless. I removed it. This reduce a lot of sophisticated code and will
make import of prices easier. This also increase speed.
2011-10-04 01:26:07 +02:00
Laurent Destailleur
08bfeab824
Doxygen
2011-09-24 21:51:52 +00:00
Regis Houssin
551e1f81bf
Fix: Space after closing parenthesis of function call prohibited
2011-09-20 13:32:16 +00:00
Regis Houssin
6c4acefd93
Fix: Space before opening parenthesis of function call prohibited
2011-09-20 12:56:06 +00:00
Laurent Destailleur
b75d19c264
Qual: Uniformize constructors
2011-09-11 18:35:38 +00:00
Regis Houssin
2ecc03104c
Fix: remove obsolete tags (in progress)
2011-08-27 15:14:31 +00:00
Laurent Destailleur
450f9e2617
Perf: Reduce seriously nb of requests
2011-08-21 10:12:18 +00:00
Laurent Destailleur
84f7eb9da6
New: task #11243 : Add best supplier price
2011-08-21 00:26:31 +00:00
Laurent Destailleur
fe27643152
New: task #11243 : Add best supplier price
2011-08-20 23:56:03 +00:00
Juanjo Menent
0fbe5fd9e1
Doxygen
2011-08-18 08:01:07 +00:00
Juanjo Menent
fe3dfbaebc
Price Fournisseurs: Add ordering fields. Add option FOURN_PRODUCT_AVAILABILITY
2011-08-17 15:22:39 +00:00
Laurent Destailleur
be771c9d44
Fix: Avoid errors into rpm packages
2011-07-31 23:45:11 +00:00
Laurent Destailleur
a881307f01
Fix: bug #30629 : Ajout de prix fournisseur avec quantité fractionné donne erreur
2010-08-28 23:54:46 +00:00
Laurent Destailleur
5b8237ecf2
Fix: default vat
2010-08-10 01:19:22 +00:00
Laurent Destailleur
186622e235
Fix: Database compatibility
2010-08-09 16:07:24 +00:00
Laurent Destailleur
87ce3073d5
Doxygen
2010-07-21 11:57:52 +00:00
Philippe Grand
b65ddfabe8
according to new tree directory
2010-04-28 21:29:12 +00:00
Philippe Grand
3f4bee1f18
according to new tree directory
2010-04-28 12:53:28 +00:00
