Commit Graph

40390 Commits

Author SHA1 Message Date
Laurent Destailleur
e8400afeba Fix: rpm packages
Conflicts:
	build/rpm/dolibarr_generic.spec
2013-07-24 13:46:50 +02:00
Laurent Destailleur
f4987a6fa5 Fix: Upgrade of package break install 2013-07-24 13:44:08 +02:00
Florian Henry
f11d477770 Fix bug export contact extrafields 2013-07-24 13:28:02 +02:00
Laurent Destailleur
7ae06c6f45 Fix: rpm packages 2013-07-24 12:15:24 +02:00
Laurent Destailleur
2f2f2b66c4 Fix: creation of thumbs not working 2013-07-24 11:26:09 +02:00
BENKE Charles
34c09c3aa5 Update pdf_blochet.class.php
add ref_ext on pdf output if not empty
2013-07-24 11:14:38 +02:00
Laurent Destailleur
126c72ca24 Merge pull request #1127 from csalvador/taskpdffix
fix pdf model import
2013-07-24 01:30:55 -07:00
Laurent Destailleur
3275a27fb6 Try to add image into md file. 2013-07-24 10:16:53 +02:00
Laurent Destailleur
644f5149e4 Merge remote-tracking branch 'origin/3.4' into develop
Conflicts:
	htdocs/core/class/html.formfile.class.php
2013-07-24 00:42:28 +02:00
Laurent Destailleur
68d83dd653 Some fix into perf.php page. 2013-07-24 00:34:08 +02:00
Laurent Destailleur
15c4c5d6b9 Some fixes into css 2013-07-23 20:48:37 +02:00
Laurent Destailleur
74ce3fe738 Fix: rowspan 2013-07-23 19:48:21 +02:00
Laurent Destailleur
30cd4aeced Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-07-23 18:37:09 +02:00
Laurent Destailleur
71634a0c76 Fix: Add missing css style 2013-07-23 18:36:18 +02:00
Laurent Destailleur
1df17b1295 Merge pull request #1126 from csalvador/marginfix
Marginfix
2013-07-23 09:33:03 -07:00
Laurent Destailleur
91debb5b82 Merge pull request #1125 from csalvador/formfile
added permission to the hook parameters to make it easier to check
2013-07-23 09:32:12 -07:00
Laurent Destailleur
9ee7cd477f Merge pull request #1124 from csalvador/holidayfix
fixed fr translation
2013-07-23 09:31:36 -07:00
Laurent Destailleur
df27538d74 Merge pull request #1122 from FHenry/3.4
Avoid PHP warning
2013-07-23 09:31:16 -07:00
Laurent Destailleur
1d81d1f42c Merge pull request #1120 from defrance69/patch-7
Update modBanque.class.php
2013-07-23 09:30:53 -07:00
Laurent Destailleur
fb0791e9d9 Merge pull request #1119 from defrance69/patch-6
Update element.php
2013-07-23 09:28:44 -07:00
Laurent Destailleur
1596619f2d Merge pull request #1118 from csalvador/bugfix
instanciation of Facture objects raised errors, deleted them
2013-07-23 09:27:56 -07:00
Laurent Destailleur
ac2ba9d1f6 Merge pull request #1117 from atm-maxime/mko149
Task 149 : # of files and notes appears in tab
2013-07-23 09:26:59 -07:00
Laurent Destailleur
8f39d30ea5 Fix: Bad parameter 2013-07-23 18:22:10 +02:00
Cédric Salvador
8cf90c38a7 fixed fr translation 2013-07-23 16:29:46 +02:00
Cédric Salvador
35faff04e9 fix pdf model import 2013-07-23 15:59:41 +02:00
Florian Henry
6f262b3a5b Avoid PHP warning 2013-07-23 15:52:41 +02:00
Laurent Destailleur
cbeeb463e2 Fix: Missing tr line 2013-07-23 15:26:35 +02:00
Laurent Destailleur
361f3a638a Fix: W3C 2013-07-23 15:24:34 +02:00
Cédric Salvador
28247f37ae corrected filter in form_thirdparty call 2013-07-23 15:15:01 +02:00
Cédric Salvador
b04e90c75d added fields to group-by statements so it stops raising errors in strict mode 2013-07-23 15:05:35 +02:00
Cédric Salvador
7bd7c5206d added permission to the hook parameters to make it easier to check 2013-07-23 11:05:46 +02:00
BENKE Charles
8c7c3f03d3 Update modBanque.class.php
Add bordereau ref_ext fields on export
2013-07-23 05:54:47 +02:00
BENKE Charles
6ffaefc002 Update element.php
Display of project element limited by user rights
2013-07-23 05:49:30 +02:00
Laurent Destailleur
2e7205f309 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-07-23 01:58:01 +02:00
Laurent Destailleur
e80583bfb7 Fix: W3C 2013-07-23 01:56:14 +02:00
Cédric Salvador
19dc3ef8da instanciation of Facture objects raised errors, deleted them 2013-07-22 11:51:29 +02:00
Juanjo Menent
e939a4d268 Merge pull request #1116 from FHenry/develop
Add category contact into left menu entry
2013-07-22 02:17:52 -07:00
lalaina rasamoelina
4ecc9b30a9 Delete the name of user who are disable in the creation of events 2013-07-22 11:17:45 +02:00
Florian Henry
26894d9749 Fix bug in SQL 2013-07-22 10:17:31 +02:00
Florian Henry
bbacef6815 Add category contact into left menu entry for augeria theme 2013-07-22 10:15:48 +02:00
Juanjo Menent
d7da816258 Merge pull request #1114 from defrance69/patch-5
Update modBanque.class.php
2013-07-22 00:05:46 -07:00
Juanjo Menent
fbdb764d41 Merge pull request #1113 from atm-maxime/develop
Work on shipment
2013-07-22 00:02:56 -07:00
Florian Henry
1a8377d847 Add category contact into left menu entry 2013-07-21 10:47:55 +02:00
BENKE Charles
c555c17315 Update modBanque.class.php
Add Export of check deposit / bill
2013-07-20 23:47:37 +02:00
Maxime Kohlhaas
da3e711be7 Task 149 : fix dir on company + added # of notes and documents on supplier order, invoice and project 2013-07-20 10:54:38 +02:00
Maxime Kohlhaas
28eb9d07b2 Task 149 : add # of notes and doc in tab + have always last 3 tabs be notes, doc and info 2013-07-20 09:07:10 +02:00
Laurent Destailleur
22b8fcfe63 Style 2013-07-19 18:01:49 +02:00
Geoffrey
27e26c872e Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
Conflicts:
	ChangeLog
2013-07-19 17:33:29 +02:00
Maxime Kohlhaas
bef913cc2f Update changelog 2013-07-19 17:28:46 +02:00
Maxime Kohlhaas
7c24686532 Add good vars for odt generation 2013-07-19 17:27:22 +02:00