lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
46,317 Commits 43 Branches 150 Tags 886 MiB
3.7
Commit Graph

159 Commits

Author SHA1 Message Date
Laurent Destailleur
5c5ff72ecd Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	ChangeLog
	htdocs/adherents/fiche.php
	htdocs/comm/fiche.php
	htdocs/comm/mailing/fiche.php
	htdocs/comm/propal.php
	htdocs/comm/propal/class/propal.class.php
	htdocs/commande/class/commande.class.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/compta/paiement.php
	htdocs/core/class/html.formcompany.class.php
	htdocs/core/tpl/login.tpl.php
	htdocs/expedition/fiche.php
	htdocs/fourn/commande/fiche.php
	htdocs/fourn/facture/fiche.php
	htdocs/fourn/facture/paiement.php
	htdocs/fourn/fiche.php
	htdocs/main.inc.php
	htdocs/product/fournisseurs.php
	htdocs/resource/card.php
 2015-01-18 17:13:42 +01:00
Laurent Destailleur
b3e216b8f1 Merge branch 'bug-1787' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-1787

Conflicts:
	ChangeLog
	htdocs/comm/propal.php
 2015-01-18 15:06:54 +01:00
Marcos García de La Fuente
7f59cf9194 Fix: [ bug #1787 ] Incorrect behaviour of doActions hook 2015-01-17 19:28:27 +01:00
Marcos García de La Fuente
85b1188593 Fix: [ bug #1788 ] Duplicated doActions hook in product/fournisseurs.php 2015-01-13 09:22:12 +01:00
Laurent Destailleur
c3b74e66ff Fix: Add constant to hide an obscur feature 2014-12-03 00:22:48 +01:00
Regis Houssin
a2446e51db New: add context "globalcard" for declaring only once all cards 2014-10-06 07:20:58 +02:00
Laurent Destailleur
ec95aacd52 Uniformize code for error reporting after a hook. 2014-09-28 03:41:32 +02:00
Marcos García de La Fuente
434bb1bec7 Migrated old message notifications to the """new""" system 2014-07-20 00:10:40 +02:00
Laurent Destailleur
eb2f8bb733 Fix: [ bug #1427 ] erreur avec le bouton fiche suivante/précédente 2014-06-20 13:43:36 +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
ce34c01b9e New: On page to enter supplier prices, if there is no supplier, add 
direct link to create one.
Qual: The following hooks are now 'addreplace'
hooks: "formCreateThirdpartyOptions" so check that return value is 0 to
keep default standard behaviour after hook or 1 to disable default
standard behaviour.
 2014-04-16 00:06:16 +02:00
Laurent Destailleur
9a8a306d78 Qual: Method form->select_currency() has been removed. Use instead 
print form->selectCurrency().
Qual: Method form->select_methodes_commande() has been renamed into
english name selectInputMethod().
 2014-04-02 14:53:42 +02:00
geoffrey.girard
bf6b4537b1 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2014-02-05 09:19:54 +01:00
geoffrey.girard
05ceecd184 add hook printObjectLine on product supplier prices list 2014-02-04 16:55:09 +01:00
Gauthier
9cdfaa3ffe add hook "doActions" on supplierprice form 2014-02-04 10:48:35 +01:00
geoffrey.girard
e418e10df0 Add new doActions hook on supplier prices page 2014-01-17 09:45:57 +01:00
Laurent Destailleur
01a9b23f26 Fix: Vat rate was not set during update 2013-12-07 01:22:27 +01:00
Laurent Destailleur
9b36df85dd Fix: invert parameters 2013-09-28 13:22:28 +02:00
Sébastien de Chateauvieux
eda6187982 TVA NPR : can use * in tva when set supplier price 2013-03-28 09:30:42 +04:00
Laurent Destailleur
56e11e52fa New: hookmanager class is used frequently and is a factory object, so we 
can move it during init of environment and use it globally.
 2013-01-25 19:12:54 +01: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
simnandez
d8651ca830 Trad: Add missing margins translations 2012-12-01 15:47:28 +01:00
Laurent Destailleur
4136c27516 RESTORE CODE WITH ID D2adaf7. The Merge daacf79 as lost more than 50 
commits !
 2012-12-01 15:45:05 +01:00
Laurent Destailleur
d30b74e69e Merge pull request #508 from simnandez/develop 
Fix: Add to areas not working if we navigate with shownavref
 2012-12-01 02:56:11 -08:00
simnandez
dda12c3d70 Trad: Add missing margins translations 2012-11-30 17:58:12 +01:00
Maxime Kohlhaas
5c9058e688 Qual : clean unused code 2012-11-22 21:56:06 +01:00
Laurent Destailleur
0152e226c1 Fix: Use correct translation of fields 2012-10-18 13:25:32 +02:00
Regis Houssin
478449da37 Fix: convert line delimiters 2012-10-08 20:47:10 +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
Marcos García
4209898d20 Lower-cased Header function 2012-08-31 05:58:38 +02:00
Marcos García
9b3c89ac47 Removed parenthesis from all include and include_once and replaced with single quotes 2012-08-23 02:40:41 +02:00
Marcos García
f3674317ec Removed parenthesis from all require and replaced with single quotes 2012-08-22 23:24:21 +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
Regis Houssin
3438305169 FIXME: with ajax autocompleter, does not see the products that have no 
supplier prices because they can be selected and it creates an error
message.
Fix: Do not make a "print" on "hook methods", just get the result
 2012-08-17 15:16:07 +02:00
Regis Houssin
e3a3dd0454 Fix: it's for margin module 2012-07-25 12:53:02 +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
82dda362c5 Fix: [ bug #409 ] List of vat rates for supplier prices must use the 
seller country.
 2012-05-23 10:50:38 +02:00
Regis Houssin
d7d26b9375 Fix: bad sql result name 2012-05-22 19:11:41 +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
993b5eefaf Fix: wrong blank space for jquery combobox 
Fix: uniformize code
 2012-03-15 10:14:54 +01:00
Regis Houssin
9301def08d Fix: rename method 2012-03-02 15:03:14 +01:00
Regis Houssin
addc8db9e7 Fix: rename hooks 2012-03-01 16:51:59 +01:00
FHenry
59f424bde3 add hook for select produit 2012-02-29 14:32:22 +01:00
Laurent Destailleur
58d1a042a5 Fix: print select_societe was wrong as it contains already print 
instructions. Use select_company instead.
 2012-02-20 12:41:12 +01:00
Regis Houssin
74b69c6659 Fix: add multicompany products sharing 2012-02-11 18:45:36 +08:00
Laurent Destailleur
bacf2003f1 Checkstyle 2012-01-22 21:17:02 +01:00