Commit Graph

34721 Commits

Author SHA1 Message Date
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
7c24686532 Add good vars for odt generation 2013-07-19 17:27:22 +02:00
Maxime Kohlhaas
00aded09bb Fix : shipment prices not related to qty shipped 2013-07-19 17:27:08 +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
Maxime Kohlhaas
fc8805f2ca Added missing trad on shipment + display calculated weight after true weight 2013-07-19 16:52:58 +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
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
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
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
Maxime Kohlhaas
9d8438ecdd Minor fix on remisecheque display 2013-07-19 13:39:01 +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
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