Commit Graph

34721 Commits

Author SHA1 Message Date
Laurent Destailleur
89d8eb19c0 Fix: navigation fails 2013-07-14 01:29:26 +02:00
Laurent Destailleur
ada3df4245 eol 2013-07-14 01:21:00 +02:00
Laurent Destailleur
94e3277516 Fix: Navigation after using numbering for supplier ref. 2013-07-14 01:19:05 +02:00
Laurent Destailleur
57ab24baca Fix: bad sort order into ecm module 2013-07-14 01:10:23 +02:00
Laurent Destailleur
154cd1fcf9 Fix: Sort on ref for supplier invoice into ged 2013-07-14 01:10:18 +02:00
Laurent Destailleur
460778818c Fix: automatic ecm for supplier invoices 2013-07-14 01:10:11 +02:00
Laurent Destailleur
8a8e55ffd3 Fix: bad sort order into ecm module 2013-07-14 01:08:53 +02:00
Laurent Destailleur
1e6171ad0e Fix: Sort on ref for supplier invoice into ged 2013-07-14 00:40:22 +02:00
Laurent Destailleur
bbe9778ced Fix: automatic ecm for supplier invoices 2013-07-14 00:09:42 +02:00
Laurent Destailleur
4608e07753 Merge remote-tracking branch 'origin/3.4' into develop
Conflicts:
	htdocs/compta/bank/account.php
2013-07-13 23:41:32 +02:00
Laurent Destailleur
55d14f430c Fix: Search on supplier ref 2013-07-13 23:36:21 +02:00
Laurent Destailleur
3a9ffb19c3 fix: eol 2013-07-13 21:14:05 +02:00
Laurent Destailleur
7cdc7c0ab2 Fix: Typo 2013-07-13 19:41:27 +02:00
Laurent Destailleur
73a33a6dae Fix: Bug to delete bank line 2013-07-13 17:56:23 +02:00
Laurent Destailleur
6db9b67e35 Fix: Missing user param 2013-07-13 17:55:36 +02:00
Laurent Destailleur
d06e9efc0f Fix: Bug to delete bank line 2013-07-13 17:55:14 +02:00
Laurent Destailleur
41cb5ec235 Fix: Missing label 2013-07-13 17:25:10 +02:00
Laurent Destailleur
3f94950b0e Fix: Clean supplier ref 2013-07-13 16:54:17 +02:00
Laurent Destailleur
330d2173be Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-07-13 15:37:30 +02:00
Maxime Kohlhaas
6c79247a4b Merge 2013-07-13 11:44:25 +02:00
Laurent Destailleur
b5820315f9 Fix: Correct permissions on files 2013-07-13 10:34:19 +02:00
Maxime Kohlhaas
0d1ab71b05 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2013-07-13 10:18:51 +02:00
Laurent Destailleur
f009100126 Fix: Bad column 2013-07-12 16:51:31 +02:00
Laurent Destailleur
ad8904a4fb Can add a picto onto line of files list. 2013-07-12 15:10:32 +02:00
Laurent Destailleur
84447fec35 More complete examples 2013-07-12 10:57:49 +02:00
Laurent Destailleur
7cff7d3250 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-07-11 20:22:21 +02:00
Laurent Destailleur
2c0a01fc8c Merge remote-tracking branch 'origin/3.4' into develop 2013-07-11 17:57:06 +02:00
Maxime Kohlhaas
0d40debeac Merge branch 'develop' of github.com:atm-maxime/dolibarr into mko862
Conflicts:
	htdocs/admin/system/perf.php
2013-07-11 17:17:43 +02:00
Maxime Kohlhaas
3c7f4a3548 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko862
Conflicts:
	htdocs/admin/system/perf.php
2013-07-11 15:55:33 +02:00
Geoffrey
54961036be Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
Conflicts:
	htdocs/admin/system/perf.php
2013-07-11 15:40:10 +02:00
Laurent Destailleur
7485192cfb Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-07-11 11:56:57 +02:00
Laurent Destailleur
158a2b8ca8 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/.gitignore
2013-07-11 11:52:32 +02:00
simnandez
442ca8ea35 Trad: Fix ca_ES and es_ES missing translation 2013-07-11 11:51:13 +02:00
simnandez
11bf611618 Trad: Fix ca_ES and es_ES missing translation 2013-07-11 11:50:31 +02:00
Laurent Destailleur
807cbe4163 Add option MAIN_GENERATE_DOCUMENT_WITH_PICTURE 2013-07-11 09:43:07 +02:00
Laurent Destailleur
548ea4f93f Fix: Navigation 2013-07-10 23:58:49 +02:00
Laurent Destailleur
c98545010b Fix: Navigation 2013-07-10 23:57:18 +02:00
Laurent Destailleur
c174be7100 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-07-10 22:59:39 +02:00
Laurent Destailleur
f690860aa8 Fix: Avoid duplicate div error. 2013-07-10 22:58:53 +02:00
Laurent Destailleur
29759a1cba Protect to avoid commiting into main source 2013-07-10 17:36:56 +02:00
Laurent Destailleur
40d7eca4bc Protect to avoid commiting into main source 2013-07-10 17:36:14 +02:00
Laurent Destailleur
27a435994a Qual: Some methods object->addline used a first parameter that was
object->id, some not. Of course this was not a good pratice, since
object->id is already known so no need to provide it as parameter.
All methods addline in this case were modified to match good
pratice and be uniformed with others.
2013-07-10 17:29:54 +02:00
Laurent Destailleur
1ee67bd5b9 Prepare code to uniformize method addline. 2013-07-10 16:07:57 +02:00
Maxime Kohlhaas
9d931b7b05 Task # 862 : ODT templates on shipment 2013-07-10 15:54:28 +02:00
Laurent Destailleur
57dbf87d0a Just use print instead of echo, just because echo is not use anuwhere
else.
2013-07-10 15:45:16 +02:00
Maxime Kohlhaas
cfc999a06d Merge 2013-07-10 15:44:53 +02:00
Laurent Destailleur
7ee23a9612 Merge pull request #1085 from csalvador/form_attach_new_file_hook
hook in form_attach_new_file(html.formfile.class.php)
2013-07-10 06:42:37 -07:00
Laurent Destailleur
f2281a4e58 Merge pull request #1086 from FHenry/3.4
remove pgsql warning on date insert
2013-07-10 06:40:31 -07:00
Maxime Kohlhaas
8f72e16444 Remove duplicate code 2013-07-10 15:34:36 +02:00
simnandez
ca406d0980 Fix: Regression in options MAIN_PROFIDx_IN_ADDRESS 2013-07-10 15:34:16 +02:00