lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
48,874 Commits 43 Branches 150 Tags 886 MiB
2266c2806f
Commit Graph

48874 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
2266c2806f Merge pull request #3396 from fappels/3.8 
Fix shipment validation: 2 times qty in SQL select
 2015-08-20 14:32:34 +02:00
Laurent Destailleur
ac6d2b47d4 Merge pull request #3398 from grandoc/3.8 
FIX : pdf_writeLinkedObjects use foreach instead of for($i..) because now linked objects return by fetchLinkedObject are associative array with ID as key.
 2015-08-20 02:52:50 +02:00
philippe grand
3743c7460d FIX : pdf_writeLinkedObjects use foreach instead of for($i..) because 
now linked objects return by fetchLinkedObject are associative array
with ID as key.
 2015-08-19 16:36:44 +02:00
fappels
38584f2cfa Fix shipment validation 2 times qty in SQL select 2015-08-19 10:42:54 +02:00
Juanjo Menent
d7ad38be13 Merge pull request #3393 from FHenry/3.8 
FIX: #3392
 2015-08-18 19:57:02 +02:00
Florian HENRY
8b62e562e5 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2015-08-18 11:14:22 +02:00
Florian HENRY
b4e810a7a8 FIX: #3392 2015-08-17 13:05:54 +02:00
Laurent Destailleur
911f37b6eb Merge remote-tracking branch 'origin/develop' into 3.8 2015-08-17 12:55:41 +02:00
Laurent Destailleur
f3c4e20db2 Fix centering of message on logon page 2015-08-15 03:41:57 +02:00
Laurent Destailleur
52240eec9a Fix removed warnings 2015-08-15 02:44:05 +02:00
Laurent Destailleur
d9b3069813 Fix: When validation and approval where done in same step, label of 
action used always label for validation.
 2015-08-15 02:34:15 +02:00
Laurent Destailleur
3bdd342df1 Fix #3116 2015-08-14 23:53:59 +02:00
Laurent Destailleur
d408193657 Fix: When stock is empty, no information was visible to explain why 
create button does not work.
 2015-08-14 20:37:20 +02:00
Laurent Destailleur
10d3c41358 Fix Bad value into popup 2015-08-14 20:07:11 +02:00
Laurent Destailleur
4ad05890c1 Merge branch 'IonAgorria-resources-fixes' into develop 2015-08-14 17:54:35 +02:00
Laurent Destailleur
6c01403ef3 Merge branch 'resources-fixes' of https://github.com/IonAgorria/dolibarr 
into IonAgorria-resources-fixes

Conflicts:
	htdocs/core/tpl/resource_add.tpl.php
	htdocs/resource/element_resource.php
 2015-08-14 17:53:52 +02:00
Laurent Destailleur
2abb90713e Fix list of resource not visible 2015-08-14 17:35:05 +02:00
Laurent Destailleur
cfc7658399 Merge pull request #3380 from FHenry/3.8 
FIX : Fix demo dump data, date '0000-00-00 00:00:00' is not valid, replace by NOW()
 2015-08-14 15:52:57 +02:00
Laurent Destailleur
84d4cbdbcc Merge remote-tracking branch 'origin/3.7' into develop 2015-08-14 15:14:33 +02:00
Laurent Destailleur
343f4086bc Remove dead code 2015-08-14 15:12:40 +02:00
Laurent Destailleur
d13b8b8284 Fix better translation 2015-08-14 13:04:35 +02:00
Laurent Destailleur
1731b1a11b Fix: transparency of event was lost 2015-08-14 13:01:20 +02:00
Laurent Destailleur
d19f1722a2 Fix: when there is several events on agenda view per user, we must 
include ref into label to have different titles.
 2015-08-14 12:31:09 +02:00
Florian HENRY
a916b75ad8 FIX : Better const usage in accountancy module 2015-08-13 11:32:31 +02:00
Florian HENRY
2775250ce4 Fix TYPE_SITUATION on sell journals 2015-08-13 11:23:27 +02:00
Florian HENRY
6806e2b36b FIX : Accountancy expert module filter on column must not launch ventil 
ventil
 2015-08-13 10:27:35 +02:00
Florian HENRY
8453e62573 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2015-08-13 10:08:12 +02:00
Florian HENRY
dc5b7c4079 FIX : Fix demo dump data, date '0000-00-00 00:00:00' is not valid, 
replace by NOW()
 2015-08-13 10:07:26 +02:00
Laurent Destailleur
d5ed875427 Fix no need the star for this case 2015-08-13 05:23:25 +02:00
Laurent Destailleur
3938a35455 Update template 2015-08-13 05:15:42 +02:00
Laurent Destailleur
0226f53098 Fix When selecting another email template, the topic was not replaced. 2015-08-13 05:09:26 +02:00
Laurent Destailleur
fc8a822f1d Merge remote-tracking branch 'origin/3.7' into develop 2015-08-13 04:03:23 +02:00
Laurent Destailleur
c73fe965d2 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/commande/class/commande.class.php
	htdocs/compta/facture/class/facture.class.php
 2015-08-13 03:58:32 +02:00
Laurent Destailleur
04812bf422 Fix date not visible and label of edit button not correct 2015-08-13 03:38:23 +02:00
Laurent Destailleur
1595765ec8 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/compta/facture/class/facture.class.php
 2015-08-13 03:18:02 +02:00
Laurent Destailleur
418a609b73 Fix PHPCS 2015-08-13 03:06:25 +02:00
Laurent Destailleur
4a6239f9a7 Fix no default value for dangerous actions 2015-08-13 02:52:58 +02:00
Laurent Destailleur
460a78e3e5 Fix translation 2015-08-13 02:13:34 +02:00
Laurent Destailleur
74bf751ca1 Fix: Missing dol_fiche_head and end 2015-08-13 01:33:04 +02:00
Laurent Destailleur
811169b2ae Fix: do not show desc if empty 2015-08-13 01:26:25 +02:00
Laurent Destailleur
8122ed9ec3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-08-13 00:51:49 +02:00
Laurent Destailleur
ba67cf9fa6 Update doc 2015-08-13 00:51:32 +02:00
Laurent Destailleur
af2d63d7e5 Merge pull request #3368 from marcosgdf/bug-3211 
FIX [ bug #3211 ] Error about sold to pay (Montant encours)
 2015-08-13 00:15:13 +02:00
Laurent Destailleur
45aed1e0aa Merge branch 'marcosgdf-bug-3313' into 3.5 2015-08-13 00:14:17 +02:00
Laurent Destailleur
dc4b429a33 Merge branch 'bug-3313' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-3313

Conflicts:
	ChangeLog
 2015-08-13 00:13:36 +02:00
Laurent Destailleur
4b51fc80a6 Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 
Conflicts:
	ChangeLog
 2015-08-13 00:06:27 +02:00
Laurent Destailleur
a8c2dfd445 Merge branch 'marcosgdf-bug-3310' into 3.5 2015-08-13 00:05:16 +02:00
Laurent Destailleur
4a124c6ee9 Merge pull request #3350 from tomours/develop 
FIX #3349 Checking a VAT number with spaces
 2015-08-12 23:51:37 +02:00
Laurent Destailleur
958321b64d Merge pull request #3340 from atm-maxime/3.6 
Rowid was missing on expedition line so no origin id when creating an invoice
 2015-08-12 23:39:43 +02:00
Laurent Destailleur
16ee7b461c Merge pull request #3332 from atm-gauthier/3.7_fix_display_country_name_on_vcard 
FIX : Display country name instead of country id (display country id …
 2015-08-12 23:38:36 +02:00