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

52088 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Philippe-OpenDSI
e3e2b87506 Product supplier list display only one product 
Last parameter of select_produits_fournisseurs_list is $limit, not $socidif
 2016-04-21 01:55:35 +02:00
Laurent Destailleur
ff140914c8 Merge pull request #5050 from FHenry/3.9 
FIX : When cloning an order the order result from clone must be now
 2016-04-21 01:50:15 +02:00
Laurent Destailleur
95ab50f93f Merge pull request #5036 from frederic34/patch-8 
FIX Get bad barcode type of product in printsheet page
 2016-04-21 01:30:15 +02:00
Florian HENRY
79f408feeb FIX : When cloning an order the order result from clone must be now 2016-04-20 17:17:03 +02:00
Frédéric FRANCE
09528cccaf Update printsheet.php 2016-04-17 19:14:48 +02:00
Juanjo Menent
0ad971556b Merge pull request #5018 from simnandez/3.9 
FIX #4961
 2016-04-15 17:33:48 +02:00
Juanjo Menent
ecbf5996c1 FIX #4961 2016-04-15 17:20:37 +02:00
Juanjo Menent
8751f6cfa0 Merge pull request #4998 from FHenry/3.9 
FIX Hook resprint  must be printed
 2016-04-15 13:05:40 +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
Florian HENRY
872c99afe9 FIX Hook resprint be printed 2016-04-12 11:35:39 +02:00
Laurent Destailleur
d0e3d9db76 Merge pull request #4992 from altatof/fix_minimum_buying_price 
FIX: correct display of minimum buying price
 2016-04-11 19:17:09 +02:00
Laurent Destailleur
fabeb37b65 Merge pull request #4990 from FHenry/3.9 
FIX  #4989
 2016-04-11 19:09:46 +02:00
Laurent Destailleur
3127432a4d Merge pull request #4987 from marcosgdf/bug-4874 
FIX #4874 SQL error when listing users
 2016-04-11 19:08:56 +02:00
Laurent Destailleur
4d14f3e6f2 Merge pull request #4983 from marcosgdf/bug-4442 
FIX #4442 Missing translation in Banks menu
 2016-04-11 18:59:03 +02:00
Laurent Destailleur
46dd3c0cec Merge pull request #4982 from marcosgdf/bug-4737 
FIX #4737 Bank transacion type selector translation is cropped
 2016-04-11 18:58:26 +02:00
Christophe Battarel
292373cf84 forgot new discount field 2016-04-11 17:43:10 +02:00
Christophe Battarel
983b2c9a21 FIX: real min buying price 2016-04-11 17:40:47 +02:00
Christophe Battarel
791df0c9ea FIX: correct display of minimum buying price 2016-04-11 17:27:34 +02:00
Florian HENRY
8035742779 FIX fetchAllEMailTemplate 2016-04-11 14:52:22 +02:00
Florian HENRY
23bb2eaf8a remove debug 2016-04-11 14:27:17 +02:00
Florian HENRY
b7275edfb8 FIX #4989 2016-04-11 14:24:31 +02:00
Juanjo Menent
f25bf64257 Merge pull request #4978 from marcosgdf/bug-4851 
FIX #4851 Project selector in supplier invoices shows the project label twice
 2016-04-10 12:41:08 +02:00
Juanjo Menent
ddb1d06ad4 Merge pull request #4980 from marcosgdf/3.8 
FIX #4743 UI glitch in project summary page
 2016-04-10 11:56:37 +02:00
Juanjo Menent
e27def479f Merge pull request #4986 from marcosgdf/bug-4747 
FIX #4747 Missing UI background when registering a supplier invoice payment
 2016-04-10 11:54:27 +02:00
Juanjo Menent
be0b7c86ff Merge pull request #4985 from marcosgdf/bug-4742 
FIX #4742 Able to delete a supplier invoice with a registered payment
 2016-04-10 11:52:21 +02:00
Juanjo Menent
c3472f7879 Merge pull request #4984 from marcosgdf/bug-4424 
FIX #4424 Missing email of user popup in supplier orders area
 2016-04-10 11:51:36 +02:00
Juanjo Menent
3dbaa38cb4 Merge pull request #4979 from marcosgdf/bug-4748 
FIX #4748 Supplier invoice payment confirmation amount is not translated
 2016-04-10 11:51:07 +02:00
Juanjo Menent
4f5d96150a Merge pull request #4977 from marcosgdf/bug-4766 
FIX #4766 VAT not shown in supplier invoice popup
 2016-04-10 11:42:29 +02:00
Marcos García de La Fuente
7acbf1dd92 FIX #4874 SQL error when listing users 
Close #4874
 2016-04-10 01:00:27 +02:00
Marcos García de La Fuente
15d9273751 FIX #4747 Missing UI background when registering a supplier invoice payment 
Close #4747
 2016-04-10 00:30:31 +02:00
Marcos García de La Fuente
af473df214 FIX #4742 Able to delete a supplier invoice with a registered payment 
Close #4742
 2016-04-09 23:29:19 +02:00
Marcos García de La Fuente
865f9defff FIX #4424 Missing email of user popup in supplier orders area 
Close #4424
 2016-04-09 23:08:47 +02:00
Marcos García de La Fuente
b9de3d5852 FIX #4442 Missing translation in Banks menu 
Close #4442
 2016-04-09 23:03:00 +02:00
Marcos García de La Fuente
3135cf720d FIX #4737 Bank transacion type selector translation is cropped 
Close #4737
 2016-04-09 22:59:12 +02:00
Marcos García de La Fuente
7cc1288bb2 FIX #4743 UI glitch in project summary page 
Close #4743
 2016-04-09 22:54:34 +02:00
Marcos García de La Fuente
1026484da1 FIX #4748 Supplier invoice payment confirmation amount is not translated 
Close #4748
 2016-04-09 22:48:42 +02:00
Marcos García de La Fuente
b2f922291f FIX #4851 Project selector in supplier invoices shows the project label twice 
Close #4851
 2016-04-09 22:38:58 +02:00
Marcos García de La Fuente
9169adf4ce FIX #4766 VAT not shown in supplier invoice popup 
Close #4766
 2016-04-09 22:34:55 +02:00
Laurent Destailleur
b5dfa2e446 Merge pull request #4975 from frederic34/patch-7 
FIX re-establish user-agent when using nusoap client
 2016-04-09 19:35:31 +02:00
Laurent Destailleur
507b9a2956 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-04-09 16:00:52 +02:00
Frédéric FRANCE
f90cffd74a Update nusoap.php 
re-establish user-agent
 2016-04-09 15:42:53 +02:00
Laurent Destailleur
234f3e331d Merge pull request #4962 from FHenry/3.8 
FIX : Template email must take care of position column
 2016-04-08 21:32:27 +02:00
Laurent Destailleur
2ffe06b1b3 Merge pull request #4965 from GPCsolutions/3.9-sentry 
Prevent sentry logging error with 3.9 update
 2016-04-08 21:31:32 +02:00
Laurent Destailleur
daa1aed363 Bad placeholder 2016-04-08 19:31:18 +02:00
Laurent Destailleur
80caf58866 FIX Default vat is not set correctly when an error occured and we use 
VAT identified by a code.
 2016-04-08 19:19:13 +02:00
Laurent Destailleur
5753f21745 Missing translations 2016-04-08 16:09:35 +02:00
Laurent Destailleur
eb7bba9568 Fix translation 2016-04-08 16:07:30 +02:00
Laurent Destailleur
39b61d6924 Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/core/boxes/box_task.php
	htdocs/core/lib/files.lib.php
 2016-04-07 19:27:53 +02:00
Laurent Destailleur
4092f5fa2f Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2016-04-07 19:24:49 +02:00