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

52140 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
ea924df4c5 Merge pull request #5080 from marcosgdf/bug-4813 
FIX #4813 Won translation for the key OppStatusWON instead OppStatusWIN
 2016-04-29 18:59:52 +02:00
Laurent Destailleur
9a1cff99cc Merge pull request #5123 from fmarcet/3.9 
FIX: Not filtering correctly when coming from dashboard
 2016-04-29 17:20:10 +02:00
Laurent Destailleur
3c2c9a25b8 Merge pull request #5130 from frederic34/patch-9 
FIX if type fee not specified, line is invisible and can't edit it
 2016-04-29 17:11:14 +02:00
Laurent Destailleur
84a39f41d6 Merge pull request #5125 from frederic34/patch-7 
FIX Load user personal param at login. This cause boxes disordered at login time.
 2016-04-29 17:10:41 +02:00
Laurent Destailleur
f4224881c3 Merge pull request #5132 from frederic34/patch-11 
FIX keep files attached with PROV status
 2016-04-29 17:08:22 +02:00
Laurent Destailleur
9a53e5edff Merge pull request #5131 from frederic34/patch-10 
If no project, update line is impossible
 2016-04-29 17:06:39 +02:00
Laurent Destailleur
c539cc7151 Merge remote-tracking branch 'origin/3.8' into 3.9 2016-04-29 15:30:04 +02:00
Laurent Destailleur
f91a8934bd Merge remote-tracking branch 'origin/3.7' into 3.8 2016-04-29 15:17:11 +02:00
Laurent Destailleur
211d217f8c Merge remote-tracking branch 'origin/3.6' into 3.7 2016-04-29 15:13:27 +02:00
Laurent Destailleur
2a27fe02eb Fix detection if tag already exists 2016-04-29 15:12:58 +02:00
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
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
Laurent Destailleur
77fcbd3884 FIX: init var at wrong place report incorrect "shippable" flag on draft 
order.
 2016-04-27 12:34:52 +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
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
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
Juanjo Menent
6ba68ee742 Merge remote-tracking branch 'upstream/3.8' into 3.8 2016-04-15 15:43:51 +02:00