Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-28 12:21:29 +01:00
Code Issues Packages Projects Releases Wiki Activity
40,390 Commits 36 Branches 191 Tags
f34aadef3df57794de74006bc2c2c9fc4da6be12
Commit Graph

40390 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
c4291c228e Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-05-06 13:16:06 +02:00
Laurent Destailleur
948e0bf753 Fix: When on delivery receipt, ref of shipment was not visible. Also 
some tabs were missing.
Fix: After deletion of delivery receipt, we must go back to shipment of
delivery receipt.
 2014-05-06 13:15:37 +02:00
Laurent Destailleur
5740c22a41 Merge pull request #1576 from grandoc/3.5 
fix : no room when number of pages sup than 9
 2014-05-06 10:21:19 +02:00
Juanjo Menent
011fe254a6 Fix: Suppliers invoice mask fails using {tttt} in numbering 2014-05-06 09:59:10 +02:00
philippe
a04cd99090 fix : no room when number of pages sup than 9 2014-05-05 19:03:25 +02:00
Laurent Destailleur
c9ebe7729f Merge branch 'bug-1371' of github.com:marcosgdf/dolibarr into 
marcosgdf-bug-1371

Conflicts:
	ChangeLog
 2014-05-04 17:56:24 +02:00
Laurent Destailleur
e8308e795d Merge branch 'FHenry-3.5' into 3.5 2014-05-04 17:44:08 +02:00
Laurent Destailleur
697f68c9a9 Merge branch '3.5' of github.com:FHenry/dolibarr into FHenry-3.5 
Conflicts:
	ChangeLog
 2014-05-04 17:43:47 +02:00
Laurent Destailleur
03f9f0bada Fix: Pb of records not correctly cleaned when module marge is 
uninstalled (conflict between 'margin' and 'margins').
 2014-05-03 20:21:35 +02:00
Marcos García de La Fuente
08301e3478 Corrected little bug when no state_id was defined 2014-05-03 17:16:37 +02:00
Laurent Destailleur
f34a9983bd Fix: Can disable features with PHPEXCEL (no DLSF compatible). 
Fix: Can disable features with CKEDITOR.
 2014-05-03 02:22:37 +02:00
Laurent Destailleur
50c10d3d1e Fix: Can disable features with PHPEXCEL (no DLSF compatible). 
Fix: Can disable features with CKEDITOR.
 2014-05-03 02:20:26 +02:00
Marcos García de La Fuente
4599b22cb5 Fix: [ bug #1357 ] Invoice creator state not printed in generated invoice documents 2014-05-02 17:15:56 +02:00
Laurent Destailleur
7216b2a843 Fix phpunit to be compatible with new version of phpunit 2014-05-02 00:08:27 +02:00
Laurent Destailleur
876a35d1a1 Fix phpunit to be compatible with new version of phpunit 2014-05-02 00:08:19 +02:00
Florian HENRY
2637305065 same 2014-05-01 18:15:32 +02:00
Florian HENRY
a4126fae66 [ bug #1341 ] Lastname not added by file or direct input in mass 
e-mailing
 2014-05-01 18:13:01 +02:00
Laurent Destailleur
4fa472518e Fix: doxygen 2014-04-26 22:23:46 +02:00
Laurent Destailleur
bd8cdd337a Fix: Option MAIN_INVERT_SENDER_RECIPIENT broken with typhon template. 2014-04-26 22:17:11 +02:00
Laurent Destailleur
537ada96a8 Fix: [ bug #1354 ] Tasks disapear in same sub-task 
Conflicts:
	htdocs/install/mysql/migration/repair.sql
	htdocs/projet/class/project.class.php
 2014-04-26 21:47:15 +02:00
Laurent Destailleur
4ecfa1d6e0 Clean corrupted data for categories 
Conflicts:
	htdocs/install/mysql/migration/repair.sql
 2014-04-26 21:40:57 +02:00
Laurent Destailleur
6968304641 Fix: [ bug #1352 ] Removing a shipping does not remove the delivery. 2014-04-26 17:27:59 +02:00
Laurent Destailleur
c54d9d9171 Fix: [ bug #1351 ] VIES verification link broken 2014-04-26 16:27:06 +02:00
Laurent Destailleur
0b1bfa56e2 Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-04-24 01:26:53 +02:00
Laurent Destailleur
889ed4a49c Fix: div was opened and not close or the oposite. 2014-04-24 01:26:28 +02:00
Laurent Destailleur
31d56d6c38 Merge pull request #1548 from atm-alexis/3.5 
Add somes dol_escape_htmltag on product cards inputs
 2014-04-23 21:14:42 +02:00
Alexis Algoud
34948ef2d6 Add somes dol_escape_htmltag on product cards inputs 2014-04-23 14:53:23 +02:00
Laurent Destailleur
78ce40f23b Merge pull request #1540 from grandoc/3.5 
Fix some misspelling
 2014-04-23 00:02:30 +02:00
philippe
8564691896 Fix some misspelling 2014-04-21 09:46:03 +02:00
Laurent Destailleur
b1fd8cf503 Merge pull request #1537 from grandoc/3.5 
style enhancement
 2014-04-20 00:13:50 +02:00
Laurent Destailleur
2213128531 Fix: invert label for accountancy_code_sell 2014-04-18 12:08:12 +02:00
Laurent Destailleur
ee3592c976 Fix: invert label for accountancy_code_sell 2014-04-18 11:21:15 +02:00
philippe
2ffe4f589e style enhancement 2014-04-18 10:54:21 +02:00
Laurent Destailleur
cb2393e663 Fix: Solve problem of _source directory. 3.5.2 2014-04-13 01:28:44 +02:00
Laurent Destailleur
81ff0a8643 Fix: Missing initialized value 2014-04-12 01:45:18 +02:00
Laurent Destailleur
80f1100bf9 Fix: Removed warning 2014-04-12 01:32:46 +02:00
Juanjo Menent
75e76dc232 Fix: Can not make withdrawals 2014-04-11 12:07:01 +02:00
Laurent Destailleur
7fcf57ca5a Fix: SQL request for export. Extra field missing. 2014-04-10 18:36:34 +02:00
Laurent Destailleur
5d4b861156 Fix: Try/catch 
Conflicts:
	htdocs/core/class/conf.class.php
 2014-04-09 17:09:38 +02:00
Laurent Destailleur
351ab9788b Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-04-09 01:38:54 +02:00
Laurent Destailleur
e061c442a6 Fix: hour:min not saved 2014-04-09 01:18:42 +02:00
Laurent Destailleur
6f40825270 Merge pull request #1527 from grandoc/3.5 
translation and cleaning
 2014-04-09 00:31:57 +02:00
Laurent Destailleur
13659b1528 Fix: [ bug #1334 ] filter lost when sorting into list of memebers. 2014-04-09 00:12:07 +02:00
Laurent Destailleur
60b37dffe1 Fix: [ bug #1323 ] generation of odt files for tasks. 2014-04-09 00:07:32 +02:00
Laurent Destailleur
4e619c42fa Fix: [ bug #1340 ] Erreur de langage dans les projets 2014-04-08 23:56:10 +02:00
Laurent Destailleur
e0e64af18c Fix: Hierarchical user not saved. 2014-04-08 23:51:50 +02:00
Grand Philippe
9a056ab497 anglicizing 2014-04-08 14:05:10 +02:00
Grand Philippe
9dd499b133 Merge branch '3.5' of https://github.com/Dolibarr/dolibarr into 3.5 2014-04-08 13:47:17 +02:00
Laurent Destailleur
eb0d98d406 Comment 2014-04-07 20:41:33 +02:00
Grand Philippe
fe49f55a48 fix from forum 2014-04-07 11:01:11 +02:00