Commit Graph

52397 Commits

Author SHA1 Message Date
Frédéric FRANCE
7e8aef037a Update expensereport.class.php 2016-04-29 13:23:06 +02:00
Frédéric FRANCE
a982f764fe don't change ref if ref is not prov 2016-04-29 12:26:41 +02:00
Frédéric FRANCE
ab63bdd235 keep files attached with PROV status 2016-04-28 22:30:22 +02:00
Frédéric FRANCE
c743f6cfe5 If no project, update line is impossible 2016-04-28 21:56:28 +02:00
Frédéric FRANCE
972e5e571d Update card.php 2016-04-28 21:52:23 +02:00
Florian HENRY
b280a700d2 FIX missing column when module was installed before standard integration 2016-04-28 14:05:56 +02:00
Frédéric FRANCE
4404197597 Load user personal param at login 2016-04-28 11:54:42 +02:00
fmarcet
33499ae652 FIX: Compatible with multicompany 2016-04-28 11:14:00 +02:00
Laurent Destailleur
608c93702d FIX Can't create a stock transfer from product card 2016-04-28 11:05:34 +02:00
fmarcet
e96e0f637a FIX: Not filtering correctly when come from dashboard 2016-04-28 10:41:37 +02:00
fmarcet
d599261d20 FIX: Not filtering correctly when come from dashboard 2016-04-28 10:38:50 +02:00
Ferran Marcet
7380676717 Fix: Not filtering correctly on supplier invoice's list 2016-04-28 10:25:55 +02:00
Maxime Kohlhaas
0a67614e72 Fix wrong qty total in ca by prod/serv report 2016-04-28 09:10:22 +02:00
Laurent Destailleur
77fcbd3884 FIX: init var at wrong place report incorrect "shippable" flag on draft
order.
2016-04-27 12:34:52 +02:00
Florian HENRY
bfbb1c20bc FIX bug on email template 2016-04-27 09:27:59 +02:00
Florian HENRY
94d92d3cbb Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2016-04-26 10:26:45 +02:00
Christophe Battarel
2a0c508d47 FIX: end of select when no fournprice 2016-04-25 11:26:13 +02:00
Alexis Algoud
1746f8f96c FIX search on date into supplier invoice list dont work because of status -1 2016-04-25 11:25:49 +02:00
Marcos García de La Fuente
d98e50e661 Little change 2016-04-23 13:44:43 +02:00
Marcos García de La Fuente
867649e922 FIX #4813 Won translation for the key OppStatusWON instead OppStatusWIN
Close #4813
2016-04-23 13:36:12 +02:00
Laurent Destailleur
f96f8eac85 Merge remote-tracking branch 'origin/3.8' into 3.9 2016-04-22 20:09:51 +02:00
Laurent Destailleur
980f3d522f Prepare 3.9.1 2016-04-22 20:09:42 +02:00
Laurent Destailleur
25810ddfc8 Merge remote-tracking branch 'origin/3.7' into 3.8
Conflicts:
	htdocs/compta/localtax/quadri_detail.php
	htdocs/core/lib/tax.lib.php
2016-04-22 20:08:33 +02:00
Laurent Destailleur
68e96b98c5 Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
	ChangeLog
	htdocs/filefunc.inc.php
2016-04-22 20:02:34 +02:00
Laurent Destailleur
7f5670cb26 Merge remote-tracking branch 'origin/3.5' into 3.6
Conflicts:
	ChangeLog
2016-04-22 19:49:27 +02:00
Laurent Destailleur
d2003e9607 Merge pull request #5058 from philippe-opendsi/patch-2
FIX #5048 Product supplier list display only one product
2016-04-22 19:44:16 +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
Philippe-OpenDSI
2fc876f607 FIX #5048 Product supplier list display only one produc
Last parameter of select_produits_fournisseurs_list is $limit, not $socid
2016-04-21 08:41:45 +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
Florian HENRY
4401d2ee9c Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2016-04-19 18:52:33 +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
Marcos García de La Fuente
aa64266c2f FIX #5008 SQL error when editing the reference of a supplier invoice that already exists
Close #5008
2016-04-16 18:44:31 +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
88ff138cd5 Merge pull request #5016 from simnandez/3.7
FIX #3815 With higher quality
2016-04-15 16:07:22 +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
9f4ccfab95 FIX #3815 With higher quality 2016-04-15 15:54:51 +02:00