lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
37,424 Commits 43 Branches 150 Tags 886 MiB
9fa37fc5f1
Commit Graph

37424 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christophe Battarel
9fa37fc5f1 Fix: Edit propal line was losing product supplier price id 
Conflicts:
	ChangeLog
 2013-09-08 21:51:08 +02:00
Laurent Destailleur
5b91e27a85 Merge remote-tracking branch 'origin/3.3' into 3.4 2013-09-06 22:32:21 +02:00
Laurent Destailleur
8a0ac8b650 Merge branch '3.3' of https://github.com/Dolibarr/dolibarr.git into 3.3 2013-09-06 13:43:12 +02:00
Laurent Destailleur
651596e8d5 Fix: missing ; 2013-09-06 13:42:14 +02:00
Laurent Destailleur
f45be6a2a7 Prepare for 3.4.1 
Merge remote-tracking branch 'origin/3.3' into 3.4

Conflicts:
	build/debian/changelog
 2013-09-06 01:37:07 +02:00
Laurent Destailleur
5db9505f40 Fix debian package 2013-09-06 01:30:49 +02:00
Laurent Destailleur
a9c14c80f0 Fix: debian files 2013-09-06 01:27:11 +02:00
Laurent Destailleur
10779baadd Merge remote-tracking branch 'origin/3.3' into 3.4 2013-09-05 23:55:14 +02:00
Laurent Destailleur
c71c4e86f6 Fix: watch file for debian package. 2013-09-05 23:52:13 +02:00
Laurent Destailleur
556827c818 Fix: wash file 2013-09-05 22:58:11 +02:00
Laurent Destailleur
b1e8b9c02f Merge remote-tracking branch 'origin/3.3' into 3.4 2013-09-05 17:56:23 +02:00
Laurent Destailleur
2ce6f55d92 Merge branch '3.3' of https://github.com/Dolibarr/dolibarr.git into 3.3 2013-09-05 17:54:00 +02:00
Laurent Destailleur
7afb1aef14 Fix: Image was not correctly generated. Bad licence into it. 2013-09-05 17:53:07 +02:00
Laurent Destailleur
da7c8b42f2 Fix: Image was not correctly generated. Bad licence into it. 2013-09-04 22:34:49 +02:00
Laurent Destailleur
c3c9e59974 Fix: Image was not correctly generated. Bad licence into it. 2013-09-04 22:33:49 +02:00
Laurent Destailleur
e40d644085 Fix: Remove warning 2013-09-04 16:49:20 +02:00
Laurent Destailleur
af22d38681 Fix: Bad total without tax 2013-09-04 15:07:35 +02:00
Laurent Destailleur
b1c25d91cd Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-09-04 10:45:35 +02:00
Laurent Destailleur
ee0f44c9e3 Fix: Try a fix of cloning lines->array 2013-09-04 10:45:15 +02:00
Laurent Destailleur
232cf5e086 Merge pull request #1214 from aspangaro/3.4 
Update translation fr_FR
 2013-09-04 01:26:30 -07:00
aspangaro
91320ef99c Update translation fr_FR 2013-09-04 05:17:33 +02:00
simnandez
83042459a5 Fix: compatiblity with multicompany module 2013-09-02 10:07:44 +02:00
Laurent Destailleur
b95aa1ac7b Fix: select list on external table 
Conflicts:
	htdocs/core/class/extrafields.class.php
 2013-09-02 00:41:14 +02:00
simnandez
b86e20f0e6 Fix: Intervention box links to contracts id 2013-08-29 12:05:29 +02:00
simnandez
fa4a9c73c4 Fix: Localtaxes balance not showing 2013-08-29 09:58:07 +02:00
Laurent Destailleur
e741ce9ea2 Merge pull request #1201 from FHenry/3.4 
Fix: Mailing module : if an email is already in destinaires list all
 2013-08-28 07:41:01 -07:00
Florian Henry
cc90c92cc0 Fix: Mailing module : if an email is already in destinaires list all 
other email from selector was not inserted
 2013-08-28 16:33:21 +02:00
Laurent Destailleur
cfa7b6ead9 Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-08-28 13:13:22 +02:00
Laurent Destailleur
b39046ca7e Fix: Add missing syslog 2013-08-28 13:05:14 +02:00
simnandez
dfd14f4430 Fix: [ bug #1043 ] Bad interventions ref numbering 2013-08-27 09:44:00 +02:00
Laurent Destailleur
9cf2d8c556 Merge pull request #1199 from GPCsolutions/3.4-fixmissingparameter 
Update parameter as expected by the function name
 2013-08-26 14:12:30 -07:00
Laurent Destailleur
570fee7e07 Merge pull request #1198 from FHenry/3.4 
Fix: If only service module is activated, it's impossible to delete
 2013-08-26 14:10:36 -07:00
Raphaël Doursenaud
dcc87263d0 Update parameter as expected by the function name 2013-08-26 18:26:11 +02:00
Florian Henry
2dce07590c Fix: If only service module is activated, it's impossible to delete 
service
 2013-08-26 14:39:35 +02:00
Laurent Destailleur
cafd75ac4a Revert a bad fix. 2013-08-24 21:55:02 +02:00
Laurent Destailleur
1c08cad6b9 Fix: Bad translation (to pick to 3.4) 
Conflicts:
	htdocs/langs/en_US/main.lang
	htdocs/langs/fr_FR/main.lang
 2013-08-24 21:41:36 +02:00
Laurent Destailleur
1c527b8db9 Merge remote-tracking branch 'origin/3.3' into 3.4 2013-08-24 20:59:02 +02:00
simnandez
c242d66530 Fix: [ bug #1039 ] Pre-defined invoices conversion 2013-08-23 18:03:16 +02:00
Juanjo Menent
20d349689d Merge pull request #1192 from altairis-fr/3.4 
fix margin reports bugs (wrong group by + jquery syntax error)
 2013-08-23 01:43:51 -07:00
Christophe Battarel
2e79e750e9 Merge branch '3.4' of https://github.com/Dolibarr/dolibarr into 3.4 2013-08-23 09:48:31 +02:00
Juanjo Menent
7e61c3703a Merge pull request #1189 from altairis-fr/3.4 
fix display of buying price on line edit when no supplier price is defined
 2013-08-23 00:15:00 -07:00
Christophe Battarel
edf7af444c fix margin reports bugs (wrong group by + jquery syntax error) 2013-08-23 09:10:15 +02:00
Christophe Battarel
ecdce9ddf6 Merge branch '3.4' of https://github.com/Dolibarr/dolibarr into 3.4 2013-08-23 09:07:10 +02:00
Juanjo Menent
37e3455f82 Merge pull request #1191 from FHenry/3.4 
Fix: Link "Show all supplier invoice" on suplier card not working
 2013-08-22 23:59:16 -07:00
Florian Henry
4f991da846 Fix: Link "Show all supplier invoice" on suplier card not working 2013-08-22 15:11:11 +02:00
Christophe Battarel
e00f02616d update changelog 2013-08-22 10:49:13 +02:00
Christophe Battarel
32dd1e4480 fix display of buying price on line edit when no supplier price is defined 2013-08-22 10:45:42 +02:00
Laurent Destailleur
05040d1997 Fix: B1032-develop: Problem in the filter of Contact by company category 2013-08-21 22:42:08 +02:00
Laurent Destailleur
dd3d0ad9ac Merge pull request #1181 from grandoc/3.3 
fix some trad
 2013-08-21 13:13:42 -07:00
Laurent Destailleur
5ca7820884 Merge pull request #1187 from altatof/3.4 
Fix retrieving of margin info when invoice created automatically from order.
 2013-08-21 13:05:46 -07:00