Commit Graph

59 Commits

Author SHA1 Message Date
jfefe
195a1b2708 FIX #2957 : missing $langs object for trigger 2015-06-04 18:10:29 +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