Commit Graph

37981 Commits

Author SHA1 Message Date
Laurent Destailleur
ad783cc4f1 Merge pull request #1112 from PaulPoulain/949-develop
949 Put the ref_client in the subject mail
2013-07-19 06:59:49 -07:00
Laurent Destailleur
9e283f98e8 Fix: removed deprecated nowrap tag
Add changelog entry
2013-07-19 15:58:07 +02:00
Laurent Destailleur
11f339eca4 Merge pull request #1111 from PaulPoulain/956-develop
956 - Possibility to edit the ref_client when we want
2013-07-19 06:54:24 -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
Laurent Destailleur
d802470aae I killed <td nowrap>. Hello <td class="nowrap"> ! 2013-07-19 14:23:42 +02:00
Laurent Destailleur
e3b38cf3bb Fix: SQL Syntax error.
Fix: A ref_ext can not be NOT NULL.
New: Add tms field into table llx_bordereau_cheque.
2013-07-19 14:09:17 +02:00
Laurent Destailleur
09fd904e76 Merge remote-tracking branch 'origin/3.4' into develop
Conflicts:
	htdocs/ecm/index.php
2013-07-19 14:01:47 +02:00
Laurent Destailleur
83b5c193f7 Fix: move search_ville into search_town (search_ville no more used into
3.5).
2013-07-19 14:00:08 +02:00
Laurent Destailleur
2814aeec1d Merge pull request #1109 from PaulPoulain/930-develop
Put the town in the list of propal
2013-07-19 04:53:51 -07:00
Laurent Destailleur
442c2cab8f Update doc 2013-07-19 13:42:19 +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
196bce7e11 Add link to RemiseCheque in account lines 2013-07-19 10:23:08 +02: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
Maxime Kohlhaas
4aa9d92a49 Display CheckReceipt on Payment card if exists 2013-07-19 09:17:54 +02:00
Maxime Kohlhaas
7abc53698a Add RefExt field on RemiseCheque 2013-07-19 08:54:11 +02:00
Laurent Destailleur
306f6dd839 Updrage to tcpdf 6.0.021 2013-07-19 00:14:30 +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
9d2489f022 Add help on extrafields lists dependencies 2013-07-18 17:49:47 +02:00
Maxime Kohlhaas
63e6cf5c81 Add possibility to define dependencies between extra lists 2013-07-18 17:42:09 +02:00
simnandez
497759d7ef Update ChangeLog 2013-07-18 17:31:34 +02:00
Juanjo Menent
e89938d66e Merge pull request #1106 from atm-maxime/develop
Add Maghreb regions and departments
2013-07-18 08:06:32 -07:00
Juanjo Menent
4c4d11585e Merge pull request #1104 from FHenry/develop_T165
[ task #165 ] Add export of multiprices
2013-07-18 08:02:21 -07:00
Laurent Destailleur
75214a6b70 New: Add graphical box for turnover and proposal 2013-07-18 16:53:31 +02:00
Geoffrey
efacfc9aa3 Add Maghreb regions and departments 2013-07-18 16:49:56 +02:00
Laurent Destailleur
d5ca2f9f40 Fix: forged select for stats where wrong when filtering on a thirdparty
Conflicts:
	htdocs/compta/facture/class/facturestats.class.php
2013-07-18 15:37:14 +02:00
Laurent Destailleur
1b70ecdb26 Fix: forged select for stats where wrong when filtering on a thirdparty 2013-07-18 15:25:25 +02:00
lalaina rasamoelina
913f4d94cc Put the ref_client in the subject mail 2013-07-18 12:39:50 +02:00
Maxime Kohlhaas
e0d037dae5 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko149 2013-07-18 11:06:38 +02:00
lalaina rasamoelina
3dac43f27a Possibility to edit the ref_client when we want 2013-07-18 11:05:50 +02:00
Florian Henry
93810cbb8d MErge Devellop and update changelog 2013-07-18 10:58:08 +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
Laurent Destailleur
36b8527bf3 Merge pull request #1103 from FHenry/develop_T925_ODTonTask
T924 & T925
2013-07-18 01:36:58 -07:00
Florian Henry
c6629f1deb Merge branch 'develop' into develop_T925_ODTonTask 2013-07-18 10:27:39 +02:00
Florian Henry
2c8c3857ba Update change Log 2013-07-18 10:25:50 +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
lalaina rasamoelina
29094c9623 Put the town in the list of propal 2013-07-18 09:20:18 +02:00
Laurent Destailleur
f36d3a122a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-07-17 21:45:25 +02:00
Laurent Destailleur
f6f14a6227 Update readme to explain how to update tcpdf debian package. 2013-07-17 21:45:05 +02:00
Florian Henry
ee82330292 On going sync/merge from other repo 2013-07-17 19:17:54 +02:00
Florian Henry
2476e7bcaf Start functionnality 2013-07-17 18:45:58 +02:00
Laurent Destailleur
3245458ff5 Merge pull request #1098 from FHenry/3.4
Fix adding email into mailing module
2013-07-17 08:41:44 -07:00
Laurent Destailleur
7b97214df5 Merge pull request #1096 from FHenry/develop_categorycontact
Develop categorycontact
2013-07-17 08:41:02 -07:00