Commit Graph

52106 Commits

Author SHA1 Message Date
Laurent Destailleur
980f3d522f Prepare 3.9.1 2016-04-22 20:09:42 +02:00
Laurent Destailleur
230807b292 Merge pull request #5056 from frederic34/patch-10
FIX If oauth has never been activated two tables are missing and printing is not working
2016-04-22 19:42:21 +02:00
Laurent Destailleur
241e765829 Merge pull request #5047 from hregis/3.9_bug
Fix: broken multicompany transverse mode authentication feature
2016-04-22 18:24:17 +02:00
Laurent Destailleur
0ef1be9364 Prepare 3.9.1 2016-04-22 18:07:34 +02:00
Frédéric FRANCE
fd9fb505b9 Update printgcp.modules.php 2016-04-21 07:53:22 +02:00
Laurent Destailleur
bcbffe3a4a Merge pull request #5037 from frederic34/patch-9
Update style.css.php
2016-04-21 02:54:07 +02:00
Laurent Destailleur
dd443fe7f5 Merge remote-tracking branch 'origin/3.8' into 3.9
Conflicts:
	htdocs/compta/localtax/quadri_detail.php
2016-04-21 02:42:43 +02:00
placid0w
d043c9ce80 Fix #5054 2016-04-21 01:56:36 +02:00
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
Frédéric FRANCE
e1d55d280e Update printgcp.modules.php 2016-04-20 22:29:27 +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
Laurent Destailleur
0c932e0ee6 Merge pull request #4997 from atm-maxime/fix_vat_on_credit_note
Fix VAT amount on credit note was > 0 when manually entered
2016-04-19 19:21:05 +02:00
Regis Houssin
0a52abab5d Fix: broken multicompany transverse mode authentication feature 2016-04-19 13:38:32 +02:00
Frédéric FRANCE
3db34a723d Update style.css.php 2016-04-18 00:55:12 +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
77263bb507 Merge pull request #5015 from simnandez/3.8
FIX #3815 With higher quality
2016-04-15 15:57:26 +02:00
Juanjo Menent
6ba68ee742 Merge remote-tracking branch 'upstream/3.8' into 3.8 2016-04-15 15:43:51 +02:00
Juanjo Menent
c5ecc46a22 FIX #3815 With higher quality 2016-04-15 15:42:58 +02:00
Juanjo Menent
0d7e3a3a5c Merge pull request #5012 from simnandez/3.8
FIX #3815 Call to undefined function local_by_date(). branch 3.8
2016-04-15 13:07:40 +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
Juanjo Menent
4446e6a36c FIX #3815 Call to undefined function local_by_date(). branch 3.8 2016-04-15 12:47:21 +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
Maxime Kohlhaas
25dcca301f Fix VAT amount on credit note was > 0 when manually entered 2016-04-12 09:47:35 +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