lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
40,307 Commits 43 Branches 150 Tags 886 MiB
82bc9e709b
Commit Graph

40307 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
82bc9e709b Fix: No message if module mailman disabled 2014-01-23 08:54:39 +01:00
Laurent Destailleur
8666524446 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2014-01-21 15:28:18 +01:00
Laurent Destailleur
8cdd0502b7 Fix: Syntax error 2014-01-21 15:27:32 +01:00
Laurent Destailleur
f3774cc5e1 Merge pull request #1385 from defrance69/patch-24 
Update fournisseur.class.php
 2014-01-21 05:05:20 -08:00
Laurent Destailleur
2c0c3ce241 Merge pull request #1383 from atm-maxime/develop 
Allow to clone an invoice on a different third
 2014-01-21 04:46:18 -08:00
Laurent Destailleur
0a372a1c7d Merge remote-tracking branch 'origin/3.5' into develop 2014-01-21 13:26:05 +01:00
Laurent Destailleur
9519c89110 Merge remote-tracking branch 'origin/3.4' into 3.5 2014-01-21 13:23:27 +01:00
Léo
46926aa685 Fix: modBarcode issue with blank list in conf (?) 
Custom DB prefix not working with barcode module ? Might help.
 2014-01-21 13:19:32 +01:00
Laurent Destailleur
d7e111b3bd Fix: Missing parent tables 2014-01-21 13:18:30 +01:00
Laurent Destailleur
8bd2a1bc32 Merge pull request #1384 from Pfontaine/fix/societe2contact_civilite 
Fix: add civilite_id field in contact when create new third party.
 2014-01-21 04:12:47 -08:00
Laurent Destailleur
709edca05c Merge pull request #1386 from zongap/patch-1 
Fix: modBarcode issue with blank list in conf (?)
 2014-01-21 04:11:32 -08:00
Laurent Destailleur
d35cbb27de Merge pull request #1387 from atm-maxime/3.5 
Fix : big bug while importing thirds
 2014-01-21 04:03:45 -08:00
Laurent Destailleur
23e6709164 Better error message 2014-01-21 12:55:05 +01:00
Laurent Destailleur
cfd8601a70 Fix: Missing parent tables 2014-01-21 12:53:27 +01:00
Maxime Kohlhaas
60e616f63e Fix : big bug while importing thirds, codes were not properly set or not imported 2014-01-21 10:29:35 +01:00
Maxime Kohlhaas
06bbc48399 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2014-01-21 09:03:25 +01:00
Léo
6c00fc33f2 Fix: modBarcode issue with blank list in conf (?) 
Custom DB prefix not working with barcode module ? Might help.
 2014-01-21 00:54:26 +01:00
Laurent Destailleur
e85cf332b3 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2014-01-20 17:34:40 +01:00
Laurent Destailleur
062230050f New: Can call back barcode number from a product ref or thirdparty ref. 2014-01-20 17:18:56 +01:00
Laurent Destailleur
30aae38efa Removed POST usage. 2014-01-20 14:23:37 +01:00
Laurent Destailleur
70debe9d9f Merge branch '3.5' of https://github.com/Dolibarr/dolibarr.git into 3.5 2014-01-20 11:25:58 +01:00
Laurent Destailleur
5b6b8f1d5b Fix: Support for reset everymonth (@99 into numbering mask) was ko when 
changing year.
 2014-01-20 11:20:38 +01:00
Laurent Destailleur
8d8e016115 Merge remote-tracking branch 'origin/3.5' into develop 2014-01-20 02:42:37 +01:00
Laurent Destailleur
fb0a4803c2 Merge remote-tracking branch 'origin/3.4' into 3.5 
Conflicts:
	htdocs/langs/en_US/main.lang
	htdocs/langs/fr_FR/main.lang
 2014-01-20 02:40:06 +01:00
Laurent Destailleur
0d18892506 Merge from 3.4 2014-01-20 02:21:30 +01:00
Laurent Destailleur
8642e2027c Fix: [ bug #1212 ] 'jqueryFileTree.php' directory traversal 
vulnerability
 2014-01-20 02:10:16 +01:00
Laurent Destailleur
0ba82d3c6e Fix: Missing test on id 2014-01-20 01:27:40 +01:00
Laurent Destailleur
1ebd56c4ee New: Add option MAIN_ADD_SALE_REP_SIGNATURE_IN_NOTE 2014-01-20 00:40:01 +01:00
Laurent Destailleur
699a079ed7 New: Add option MAIN_AUTO_TIMESTAMP_IN_PUBLIC_NOTES and 
MAIN_AUTO_TIMESTAMP_IN_PRIVATE_NOTES to automatically add
timestamp and user line into editionf field when editing a note.
 2014-01-20 00:31:32 +01:00
Laurent Destailleur
73be349233 Merge remote-tracking branch 'origin/3.5' into develop 2014-01-19 23:47:58 +01:00
Laurent Destailleur
5f58bff981 Use _ instead of - for option SUPPLIER_REF_IN_NAME 2014-01-19 22:59:37 +01:00
Laurent Destailleur
6253385b17 Fix: Thumbs was not visible when file was uploaded with extension in 
upper case.
 2014-01-19 22:51:24 +01:00
Laurent Destailleur
123cd787f5 Merge remote-tracking branch 'origin/3.5' into develop 2014-01-19 22:44:34 +01:00
Laurent Destailleur
79e4c283db Fix: Deletion of files was broken 2014-01-19 22:43:36 +01:00
Laurent Destailleur
cbf6e8563d New: Add option SUPPLIER_REF_IN_NAME 2014-01-19 22:00:02 +01:00
Laurent Destailleur
becd65f9d3 Fix: Bad space into log 2014-01-19 21:34:48 +01:00
BENKE Charles
0d80d9331f Update fournisseur.class.php 
wrong object
 2014-01-19 15:44:58 +01:00
Peter Fontaine
919a7cd4a6 Fix: add civilite_id field in contact when create new third party. 2014-01-19 14:21:11 +01:00
Laurent Destailleur
c7a73e4e00 Merge remote-tracking branch 'origin/3.5' into develop 2014-01-18 12:57:13 +01:00
Laurent Destailleur
22767bac36 Fix: Missing the version into url 2014-01-18 12:51:27 +01:00
Laurent Destailleur
1fd67807ce Merge remote-tracking branch 'origin/3.5' into develop 2014-01-18 01:13:29 +01:00
Laurent Destailleur
4074547589 Fix;: Pb of caching static resource (js and css). Add a workaround to 
avoid any problems.
 2014-01-18 00:50:21 +01:00
Maxime Kohlhaas
7e8a7f7e7f Allow to clone an invoice on a different third 2014-01-17 15:44:06 +01:00
Maxime Kohlhaas
87ab3ae297 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2014-01-17 15:37:49 +01:00
Laurent Destailleur
031fd2f8b8 Fix: No set focus 2014-01-17 03:25:31 +01:00
Laurent Destailleur
f1a380f02b Merge pull request #1374 from altairis-fr/export_supplier_prices 
Add supplier informations in product export (supplier name, supplier product ref and supplier unit price)
 2014-01-16 07:19:46 -08:00
Christophe Battarel
0bdcd108f5 Add supplier informations in product export (supplier name, supplier product ref and supplier unit price) 2014-01-16 11:04:56 +01:00
Laurent Destailleur
c5bcc92651 Rename tag note to differentiate public and private note 2014-01-16 00:07:45 +01:00
Laurent Destailleur
f83044c5c5 Qual: Include migration script into continuous integration. 2014-01-15 21:35:49 +01:00
Laurent Destailleur
6f4e2dd9fc Qual: Include migration script into continuous integration. 2014-01-15 20:33:40 +01:00