Commit Graph

6676 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
7c24686532 Add good vars for odt generation 2013-07-19 17:27:22 +02:00
Laurent Destailleur
486920958c Fix: Restore error message, but only when required. 2013-07-19 17:19:35 +02:00
Laurent Destailleur
c7aadfcf65 Fix: syntax error 2013-07-19 17:18:44 +02:00
Laurent Destailleur
7aa5daaeaf Merge pull request #1110 from GPCsolutions/noerrorsondocuments
Avoid printing errors on documents that are fine without
2013-07-19 07:41:51 -07:00
Laurent Destailleur
91b51f1f58 Fix: Some td cells must not have hover styles. 2013-07-19 15:52:49 +02:00
Laurent Destailleur
ed52dd9636 New: A more responsive desgin for statistic box of home page
Qual: Hook for statistics now match specifications.
2013-07-19 15:29:40 +02:00
Raphaël Doursenaud
e119a5c650 Avoid printing errors on documents that are fine without 2013-07-19 15:08:30 +02:00
Laurent Destailleur
d802470aae I killed <td nowrap>. Hello <td class="nowrap"> ! 2013-07-19 14:23:42 +02:00
Laurent Destailleur
3896cde299 Removed useless method. Prefer using generic method. 2013-07-19 13:38:57 +02:00
Laurent Destailleur
4d2c80a122 Merge pull request #1107 from atm-maxime/develop
Add possibility to define dependencies between extra fields lists
2013-07-19 04:16:27 -07:00
Laurent Destailleur
e06752bc0e Merge pull request #1105 from atm-maxime/mko149
Task 149 : # of files and notes appears in tab
2013-07-19 04:14:05 -07:00
Maxime Kohlhaas
efff92fe1c Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2013-07-19 09:19:34 +02:00
Maxime Kohlhaas
01e4d905fb Start work on bank sharing for multi-company 2013-07-19 09:19:20 +02:00
Laurent Destailleur
c943ef8edb Fix: doxygen 2013-07-18 23:39:29 +02:00
Laurent Destailleur
22f57e3350 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-07-18 19:02:02 +02:00
Laurent Destailleur
a240dba290 Fix: Translation of text 2013-07-18 19:01:19 +02:00
Maxime Kohlhaas
aff2be1bc0 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2013-07-18 17:50:51 +02:00
Maxime Kohlhaas
63e6cf5c81 Add possibility to define dependencies between extra lists 2013-07-18 17:42:09 +02:00
Laurent Destailleur
75214a6b70 New: Add graphical box for turnover and proposal 2013-07-18 16:53:31 +02:00
Maxime Kohlhaas
e0d037dae5 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko149 2013-07-18 11:06:38 +02:00
Florian Henry
9d942017ee Merge remote-tracking branch 'origin/develop' into develop_T165 2013-07-18 10:56:57 +02:00
Florian Henry
d5731dd310 [ task #165 ] Add export of multiprices 2013-07-18 10:47:08 +02:00
Florian Henry
0c0a64f532 [ task #924 ] Add numbering rule on task
[ task #925 ] Add ODT document generation for Tasks in project module
2013-07-18 10:24:45 +02:00