Regis Houssin
33a82c396e
Fix: broken feature for use hooks with dol_move_uploaded_file method
2013-03-26 17:12:00 +01:00
frederic34
1cd39df82b
Merge remote-tracking branch 'upstream/develop' into develop
2013-03-26 10:24:46 +01:00
fhenry
7881502b52
[ task #773 ] Add Project document in GED(ECM) modules
2013-03-25 09:56:07 +01:00
Laurent Destailleur
b3d4811b6f
New: Another method to allow style tags into email.
...
Preivous one was using encoding, but this create data to not be stored
correctly into database. Old method is still available by adding
'_encoded' at end of toolbar name.
2013-03-24 19:00:58 +01:00
Laurent Destailleur
fe7cad8d6a
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-03-24 02:28:29 +01:00
Laurent Destailleur
24427d2c65
Use combo list for revenue stamp
2013-03-24 00:35:40 +01:00
fhenry
d84cd86a50
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop
Merge Cron module
2013-03-23 20:24:28 +01:00
Laurent Destailleur
c3589e9785
Some debug into cron module:
...
- Because cron is a module, constant must start with CRON_.
- Miscellanous fixes.
- For external link to run jobs from url, we must forge url using conf
file and not autodetect url.
2013-03-23 19:23:17 +01:00
Laurent Destailleur
73de8d169f
Fix: Avoid call method on non object error
2013-03-23 18:04:46 +01:00
fhenry
8971e6fe15
[ task #710 ] Envoi de mail
2013-03-23 14:39:23 +01:00
eldy
90025f9c13
Work on revenue stamp
2013-03-23 13:07:25 +01:00
eldy
c8d6e9e44a
Fix: List of customers to build invoice or order
2013-03-23 12:33:25 +01:00
eldy
3af7ca5ac8
Work on revenue stamp feature.
2013-03-23 12:23:09 +01:00
Regis Houssin
34bfdb1846
Fix: broken feature if the table has no field fk_parent_line
2013-03-22 19:21:46 +01:00
Laurent Destailleur
350bcea183
Merge
2013-03-22 17:10:17 +01:00
Laurent Destailleur
45a6717dd3
Merge pull request #752 from FHenry/develop
...
task #768 & task #769
2013-03-18 05:02:38 -07:00
Laurent Destailleur
2da3fb68a0
Merge pull request #751 from jfefe/extrasep
...
New type of extrafield : separator
2013-03-16 07:41:34 -07:00
Laurent Destailleur
fcef334122
Merge pull request #748 from GPCsolutions/naturalsearch
...
Natural search
2013-03-16 07:38:55 -07:00
fhenry
cf21b32eb1
task #768
2013-03-16 09:46:34 +01:00
fhenry
98cc7b7a2b
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-03-16 09:43:57 +01:00
fhenry
e71103ed02
task #768 :
...
https://doliforge.org/tracker/?func=detail&aid=768&group_id=144
task #769 :
https://doliforge.org/tracker/?func=detail&aid=769&group_id=144
2013-03-16 09:23:34 +01:00
jfefe
ba0963ea7d
Fix : implement separator extrafield - missing check on update
2013-03-16 00:00:57 +01:00
jfefe
b36b776f10
IKM : work on new extrafield separator type
2013-03-15 23:39:18 +01:00
jfefe
654e99df8c
Work on new type of extrafield : separator with no field stored in database
2013-03-15 18:56:10 +01:00
Laurent Destailleur
9bae946178
Fix: Return of function with no return should not be set into a
...
variable.
2013-03-15 18:27:48 +01:00
jfefe
74f480a53b
Merge remote-tracking branch 'upstream/develop' into extrafields
2013-03-15 18:21:03 +01:00
Raphaël Doursenaud
16efed11ca
Added natural search to product line search
2013-03-15 16:05:49 +01:00
Laurent Destailleur
9729e83e66
Fix: Do not use deprecated function
...
New: ajax constant on off can be reversed
2013-03-13 23:05:34 +01:00
jfefe
76efc04840
Show number with dot to avoid error when update extrafield
2013-03-13 22:01:34 +01:00
Laurent Destailleur
80b5bd7215
Comment
2013-03-13 19:14:49 +01:00
Laurent Destailleur
ed5d1196b2
Fix: no link if user unknown
2013-03-13 17:34:54 +01:00
frederic34
33e6654454
print ipp
2013-03-12 01:06:49 +01:00
frederic34
9c8a9ff7dc
Print IPP
2013-03-11 23:35:31 +01:00
Laurent Destailleur
0219f11e64
Fix: Missing default value
2013-03-11 17:01:46 +01:00
Laurent Destailleur
e1bf659db5
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-03-11 16:49:37 +01:00
Laurent Destailleur
5bc66318c2
New: use dolGetFirstLastname() everywher we should.
2013-03-11 15:54:01 +01:00
jfefe
ba8525bd6a
Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into extrafields
...
Conflicts:
htdocs/install/doctemplates/invoices/template_invoice.odt
htdocs/install/doctemplates/proposals/template_proposal.odt
htdocs/install/mysql/migration/3.3.0-3.4.0.sql
2013-03-11 05:21:35 +01:00
Laurent Destailleur
746e005726
Fix: Fix ton of regression due to field name change
2013-03-09 20:34:38 +01:00
Laurent Destailleur
0f1741a06b
New: hooks for pdf_writelinedesc now implement the rule to overwrite or
...
not default code (http://wiki.dolibarr.org/index.php/Hooks_system )
2013-03-09 15:05:09 +01:00
frederic34
135de9ecdb
Print IPP
2013-03-08 11:54:32 +01:00
frederic34
2e03169acd
Print IPP icon display in formfile
2013-03-08 11:47:48 +01:00
Laurent Destailleur
c86f3ef4b4
Merge remote-tracking branch 'origin/3.3' into develop
...
Conflicts:
htdocs/commande/fiche.php
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
2013-03-08 01:57:32 +01:00
Laurent Destailleur
44698fcde0
Fix: dol_is_dir may not be loaded, so call fails
2013-03-08 01:53:41 +01:00
jfefe
fcd81e47eb
Use price2num() function instead of price() to use calcul in ODT.
...
Libre/Open Office wants number with dot and no space to allow make calcul in ODT document
2013-03-07 03:43:23 +01:00
jfefe
289e2e7888
New function to fill ODT substitution array with extrafield of object
2013-03-07 03:27:28 +01:00
jfefe
65ed01a251
Extrafields on ODT (propal) : fix value of price with currency & display date with correct format
2013-03-07 03:27:20 +01:00
jfefe
ac3116930c
Add value to store price type extrafield without currency in ODT
2013-03-07 03:27:08 +01:00
jfefe
06807ce198
Fix : select correct value of extrafield (select list)
2013-03-07 02:13:21 +01:00
jfefe
7d3c35fb90
Merge branch 'extra_propal' into extrafields
2013-03-06 01:41:47 +01:00
jfefe
55bfdd341d
Fix : change to variable with unused name
2013-03-05 23:51:42 +01:00
