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

37390 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Christophe Battarel
dd32dbacb5 Fix retrieving of margin info when invoice created automatically from order (used by workflow module) 2013-08-21 18:55:11 +02:00
Juanjo Menent
7e27b9f221 Merge pull request #1186 from FHenry/3.4 
Fix UserGroup name not display in card view or edit
 2013-08-21 08:48:31 -07:00
Florian Henry
71ec4ea31c Merge remote-tracking branch 'origin/3.4' into 3.4 
Conflicts:
	ChangeLog

Change-Id: I325ab3266300286664f4790b5f2314255ac1911d
 2013-08-21 17:32:52 +02:00
Florian Henry
ba4fde20ce Fix UserGroup name not display in card view or edit 2013-08-21 17:03:13 +02:00
Juanjo Menent
b6d998d1c5 Merge pull request #1185 from altatof/3.4 
fix old bug on reordering supplier products in list
 2013-08-21 06:27:22 -07:00
Christophe Battarel
9ac22149d4 fix old bug on reordering supplier products in list 2013-08-21 15:18:00 +02:00
simnandez
4e34e7b71c Fix: [ bug #1037 ] Consumption> Supplier invoices related 2013-08-21 12:06:02 +02:00
Grand Philippe
49e38e1263 fix some trad 2013-08-16 10:16:06 +02:00
Juanjo Menent
6b0e521920 Merge pull request #1177 from FHenry/3.4 
Fix update extrafield do not display immediatly
 2013-08-14 00:48:08 -07:00
Florian Henry
60b3f61339 Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 
Conflicts:
	ChangeLog
 2013-08-13 12:13:47 +02:00
Florian Henry
d6c7ac5f73 Fix canvas feature broken 2013-08-13 09:16:39 +02:00
Florian Henry
5fcbd2d14f Fix Bug with canvas 2013-08-12 19:44:30 +02:00
Florian Henry
da565b2c7f Change-Id: I3d7bc928bf2428e4a96c61fd9d22e8235792dfe7 2013-08-12 19:43:51 +02:00
simnandez
067c8c55b9 Fix: [ bug #1033 ] SUPPLIER REF disappeared 2013-08-12 18:42:01 +02:00
Florian Henry
26d1352de4 Fix update extrafield do not display immediatly 2013-08-12 14:30:42 +02:00
Laurent Destailleur
34987d3e8b Exclude conf.php file from git 2013-08-10 13:02:13 +02:00
Laurent Destailleur
ba58ab153b Merge remote-tracking branch 'origin/3.3' into 3.4 2013-08-10 01:09:11 +02:00
Laurent Destailleur
e56ef31cfb Merge pull request #1174 from FHenry/3.4 
Fix: Supplier invoice and supplier order are not displayed into object
 2013-08-09 04:15:29 -07:00
Florian Henry
75701ee995 Fix: Supplier invoice and supplier order are not displayed into object 
link into agenda event card
 2013-08-09 13:11:18 +02:00
simnandez
b9e1a57f67 Fix: [ bug #1029 ] Tulip numbering mask 2013-08-08 10:00:06 +02:00
Laurent Destailleur
0f86755033 Fix: Found a dozen of bugs into sub module delivery of module shipment. 
Conflicts:
	htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
	htdocs/expedition/class/expedition.class.php
	htdocs/expedition/fiche.php
 2013-08-07 15:29:13 +02:00
Laurent Destailleur
23516a466c Fix: Pb with predefined invoices 2013-08-06 23:56:13 +02:00
Laurent Destailleur
f57aaf4f4a Fix: Do not load class like it should 2013-08-06 22:58:26 +02:00
Laurent Destailleur
4346a3f90f Fix: Param must be a regex string 
Conflicts:
	htdocs/core/class/html.formfile.class.php
 2013-08-06 19:34:13 +02:00
Laurent Destailleur
c3dd7c3b39 Fix: Tons of regression after renaming note field into note_private. 2013-08-06 13:22:35 +02:00
Laurent Destailleur
afae841ae4 Fix: Permissions on files 2013-08-06 00:36:21 +02:00
Laurent Destailleur
04caccc5f3 Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-08-05 23:37:13 +02:00
Laurent Destailleur
784c8acaf7 Trans: Upgrade language file 2013-08-05 23:27:13 +02:00
Laurent Destailleur
a7b182c37c Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 2013-08-05 13:09:39 +02:00
Laurent Destailleur
b01fd7b739 Fix: Permission into git repo are wrong for some files. 2013-08-05 12:54:34 +02:00
Laurent Destailleur
4ec86717be Fix: Bad char % 2013-08-03 15:51:32 +02:00
Laurent Destailleur
3730d874c9 Fix: [ bug #991 ] Error when adding a product in POS when no Tax is 
associated to the country of the company
 2013-08-01 18:09:01 +02:00
Laurent Destailleur
8b0169f468 Fix: [ bug #991 ] Error when adding a product in POS when no Tax is 
associated to the country of the company
 2013-08-01 18:01:25 +02:00
Laurent Destailleur
d8778ce0f7 Fix: [ bug #1010 ] change index.php to list.php in fourn/fiche 2013-08-01 17:52:21 +02:00