Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
79,034 Commits 36 Branches 189 Tags
fec67aade476d54d96db49b200bf53e0927e5eb0
Commit Graph

1469 Commits

Author SHA1 Message Date
Laurent Destailleur
b04682db4c Fix Edit of extrafield on supplier invoice or order was deleteing other 
fields.
Fix Missing escapment
Fix new field delivery date was only into edit page
 2015-02-22 17:41:02 +01:00
Laurent Destailleur
e3713c8b6d Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/admin/tools/eaccelerator.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/commande/dispatch.php
 2015-02-19 00:01:26 +01:00
Laurent Destailleur
d7dcf28c61 Merge branch '3.7' of https://github.com/atm-gauthier/dolibarr into 
atm-gauthier-3.7

Conflicts:
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
 2015-02-18 23:15:40 +01:00
Laurent Destailleur
b6947dbe2c Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/core/modules/DolibarrModules.class.php
 2015-02-18 22:04:26 +01:00
Laurent Destailleur
1e1543403b New: Add option SUPPLIER_ORDER_AUTOADD_USER_CONTACT to automatically set 
user approving as contact following supplier order.
 2015-02-17 19:49:17 +01:00
Laurent Destailleur
ad67fe50a3 Correct management when delivery date is universal time format. 2015-02-17 17:21:41 +01:00
Gauthier
be56f76743 FIX : Display error on dispatched quantity when we have several times same product in a supplier order 2015-02-12 12:56:21 +01:00
Laurent Destailleur
179cbbd187 Maxi debug and enhancement of module batch. 2015-02-11 22:54:06 +01:00
Laurent Destailleur
fb3cf4da1e New: The comment of the stock movement when making a supplier order 
receiving is also stored into the tracking dispatch table (not only into
stock movement table).
 2015-02-11 15:03:33 +01:00
Laurent Destailleur
b9d2de99e1 Translation 2015-02-11 14:46:16 +01:00
Laurent Destailleur
621976317a Fixed error management 2015-02-10 21:08:02 +01:00
phf
34bc1dbc15 Merge branch 'develop' into new_ask_price 2015-02-09 09:07:50 +01:00
phf
1d9a3e0ce2 [CORE] Fix : renommage d'une fonction (#deliverytime). 2015-02-06 16:39:54 +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
phf
8ace3ee77b [CORE] FIX : la validation d'une demande de prix à "accéptée" ne créer plus d'entré si le prix ou la quantité est à 0. 
FIX : la création d'une commande depuis une demande ne prend plus en compte les produits qui ont un prix ou quantité à 0. (#new_ask_price).
 2015-02-06 10:17:10 +01:00
Laurent Destailleur
4c5fa7510c Fix bad translation key 2015-02-05 12:06:20 +01:00
phf
b9ac5bc9e0 [CORE] correction bug lors de l'appel d'une fonction addline() et mise en commentaire d'un traitement inutile puisqu'on est uniquement dans le cas du fonctionnement du module (#new_ask_price). 2015-02-03 15:26:14 +01:00
frederic34
6a1865adb6 Merge remote branch 'upstream/develop' into tooltip 
Conflicts:
	htdocs/fourn/commande/list.php
 2015-01-31 09:58:41 +01:00
Laurent Destailleur
d0cc56d616 Showing price without tax also. 2015-01-31 01:12:05 +01:00
Laurent Destailleur
74dafbe034 Fix missing class 2015-01-31 00:45:55 +01:00
Laurent Destailleur
03cc1bd039 Fixed bad sql error 2015-01-31 00:27:35 +01:00
Laurent Destailleur
a35bd9a3e4 Fixed bad sql request 2015-01-31 00:27:11 +01:00
Laurent Destailleur
2684b327e5 Fixed bad sql error 2015-01-31 00:23:10 +01:00
Laurent Destailleur
29d399ba79 Merge remote-tracking branch 'origin/3.7' into develop 2015-01-31 00:09:37 +01:00
Laurent Destailleur
0ea4a5db7d Fixed: Error management on triggers 2015-01-31 00:08:45 +01:00
Laurent Destailleur
275e198041 New: Selection of project use the new select2 component. 2015-01-30 19:57:38 +01:00
phf
d2cd78884e [CORE] ajout de code nécessaire pour le fonctionnement du module pour créer une code fournisseur depuis une demande validé et accépté (#new_ask_price). 2015-01-30 16:52:14 +01:00
frederic34
b850b7b448 Merge remote branch 'upstream/develop' into tooltip 
Conflicts:
	htdocs/langs/en_US/sendings.lang
 2015-01-30 16:45:24 +01:00
frederic34
736bee565c Tooltip everywhere 2015-01-30 16:40:33 +01:00
Laurent Destailleur
59711298c3 Fixed: Length of project label is no more truncated on element cards 
(invoice, proposal, order...)
 2015-01-30 16:33:39 +01:00
Laurent Destailleur
4fdc287717 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/accountancy/customer/card.php
	htdocs/accountancy/journal/sellsjournal.php
	htdocs/admin/menus.php
	htdocs/fourn/commande/card.php
	htdocs/install/check.php
 2015-01-30 15:53:06 +01:00
phf
3b0fd5ec98 [CORE] modification légère, début de redirection pour créer une commande fournisseur si la demande est accépté (#new_ask_price). 2015-01-29 17:36:12 +01:00
Laurent Destailleur
b61c475aa8 Clean code for validate permissions. "validate" is a status to say, "now 
it exists, it is no more a draft", so by default we don't need this
permissions (it is same than create). We keep "validate" permissions as
an "advanced" permission only.
 2015-01-25 21:32:40 +01:00
Laurent Destailleur
ad68b3ca6c Fixed approve during validation if user has permission 
Fixed error management
Fixed rendering country must be same for all tabs.
 2015-01-25 00:59:46 +01:00
frederic34
76bf95789d Merge remote branch 'upstream/develop' into tooltip 
Conflicts:
	htdocs/fourn/commande/list.php
 2015-01-24 21:51:33 +01:00
frederic34
e18577aa62 Tooltip and lib for file cache 2015-01-24 21:46:05 +01:00
Laurent Destailleur
267ba24820 Generalize option PROJECT_SHOW_REF_INTO_LISTS 2015-01-24 21:41:40 +01:00
jean
b809f0aeb8 Merge remote-tracking branch 'origin/3.6' into 3.6 2015-01-20 17:31:17 +01:00
Laurent Destailleur
e220ce5a82 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/comm/card.php
	htdocs/comm/propal.php
	htdocs/commande/card.php
	htdocs/compta/facture.php
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/core/class/html.formcompany.class.php
	htdocs/custom/.gitignore
	htdocs/expedition/card.php
	htdocs/fourn/card.php
	htdocs/product/fournisseurs.php
 2015-01-18 18:44:22 +01:00
KreizIT
a9008c4993 Fix Creating default object from empty on supplier order confirmation 2015-01-15 17:40:15 +01:00
Cedric
999a6052ff FIX : Creating default object from empty when validating supplier order 2015-01-15 16:23:10 +01:00
Laurent Destailleur
5ead994955 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	ChangeLog
 2014-12-26 04:57:55 +01:00
Marcos García de La Fuente
aec1bdb3c4 Fixed [ bug #1766 ] PHP Warning when adding a service to a supplier invoice 2014-12-25 23:08:07 +01:00
Laurent Destailleur
711b033844 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/contrat/card.php
	htdocs/core/class/html.form.class.php
	htdocs/product/stock/card.php
 2014-12-14 12:35:13 +01:00
Laurent Destailleur
b681885542 Fixed: Bad url link 2014-12-10 21:14:59 +01:00
Laurent Destailleur
ef4bdcdb2a Merge remote-tracking branch 'origin/3.7' into develop 2014-11-30 15:43:04 +01:00
Laurent Destailleur
e395fd8096 Fix CRLF 2014-11-30 15:24:39 +01:00
Laurent Destailleur
a724c3aa70 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/main.inc.php
 2014-11-28 02:26:40 +01:00
Marcos García de La Fuente
5cc015268e Fixed [ bug #1718 ] Mistakenly searching for text in amount field breaks 2014-11-28 01:02:59 +01:00
Laurent Destailleur
806719b562 Merge pull request #2089 from marcosgdf/bug-1718 
Fixed [ bug #1718 ] Mistakenly searching for text in amount field breaks
 2014-11-28 00:37:56 +01:00