fhenry
|
195af1f2bd
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
|
2013-02-18 15:25:27 +01:00 |
|
fhenry
|
fd4a465c90
|
Fix mass maling tabs regression
|
2013-02-18 15:25:13 +01:00 |
|
Laurent Destailleur
|
da7b5e352f
|
Merge remote-tracking branch 'origin/3.3' into develop
Conflicts:
htdocs/langs/fr_FR/admin.lang
New: Add function dol_set_focus('#xxx')
|
2013-02-18 15:01:00 +01:00 |
|
jfefe
|
2f4a80215b
|
Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into extrafields
|
2013-02-18 13:39:00 +01:00 |
|
jfefe
|
fe57b513f8
|
Merge branch 'extra_odt' into extrafields
|
2013-02-18 00:58:54 +01:00 |
|
jfefe
|
71a2b4c8c0
|
In ODT document add currency symbol with extrafields of type "price"
|
2013-02-18 00:58:40 +01:00 |
|
jfefe
|
3ef8c6e5dd
|
Missing variable declaration
|
2013-02-18 00:40:49 +01:00 |
|
fhenry
|
3694031053
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
|
2013-02-17 21:41:27 +01:00 |
|
jfefe
|
8ebb48cb5c
|
Fix : in ODT show value and not label of company extrafield
|
2013-02-17 21:28:00 +01:00 |
|
jfefe
|
060060f08b
|
Missing object $langs when showing extrafield of type 'price'
|
2013-02-17 21:27:48 +01:00 |
|
jfefe
|
16e9f6db48
|
Fix : bad name of property when retrieve extrafields for thirdparty
|
2013-02-17 21:27:33 +01:00 |
|
jfefe
|
527beab671
|
Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into extra_odt
|
2013-02-17 21:26:56 +01:00 |
|
Laurent Destailleur
|
249a03dd57
|
Merge pull request #659 from jfefe/extrafields
Work on extrafields
|
2013-02-16 14:19:24 -08:00 |
|
Laurent Destailleur
|
2ea62073b6
|
Merge pull request #660 from grandoc/develop
fix : doesn't work with a /
|
2013-02-16 14:14:30 -08:00 |
|
Laurent Destailleur
|
50decdd941
|
Fix: When creating user on other entity, no way to read user
after creation.
|
2013-02-16 21:06:15 +01:00 |
|
jfefe
|
fa53147d0a
|
Retrieve extrafields when fetch thirparty
Work on extrafields support in thirpdparty ODT document
|
2013-02-16 03:41:11 +01:00 |
|
Grand Philippe
|
ab2b06117b
|
fix trad : change adresse versus address
|
2013-02-15 19:56:51 +01:00 |
|
Grand Philippe
|
2bfd6c40d0
|
fix trad : change adresse versus address
|
2013-02-15 19:26:09 +01:00 |
|
Laurent Destailleur
|
b1ee14ce60
|
New: Can define a hierarchical responsible on users.
|
2013-02-15 18:39:27 +01:00 |
|
Grand Philippe
|
7c47dedbce
|
fix trad: begin change address instead of adresse
|
2013-02-15 17:33:07 +01:00 |
|
Laurent Destailleur
|
e0bbb78f56
|
Fix: Merge customer and prospect tab
|
2013-02-15 17:28:07 +01:00 |
|
Laurent Destailleur
|
7260f39d21
|
New: Support tag total_vat_x.y for vat rate x.y into ODT templates
|
2013-02-15 17:06:32 +01:00 |
|
Grand Philippe
|
7c1a4e6fdf
|
fix trad to get better understanding
|
2013-02-15 15:48:53 +01:00 |
|
jfefe
|
3d8197ce4b
|
Work on extrafields : position management & new type : select list
|
2013-02-15 11:19:49 +01:00 |
|
jfefe
|
14f21bc9f1
|
Add select list in extrafields type
|
2013-02-15 00:17:42 +01:00 |
|
fhenry
|
c02bd08711
|
Checkstyle
|
2013-02-14 16:35:54 +01:00 |
|
fhenry
|
ff214dd295
|
Manage tabs (add/remove by external module) for mass emalings screen
|
2013-02-14 16:25:43 +01:00 |
|
jfefe
|
e2d03a9dba
|
Add possibility to disable hook on list of recent file
|
2013-02-14 13:15:23 +01:00 |
|
Laurent Destailleur
|
91215a075a
|
Merge pull request #653 from atm-maxime/develop
Set draft function
|
2013-02-13 08:54:57 -08:00 |
|
Laurent Destailleur
|
7d1c51ab77
|
Add option MAIN_PDF_TITLE_BACKGROUND_COLOR
|
2013-02-13 16:45:53 +01:00 |
|
Maxime Kohlhaas
|
bfc5cfebce
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
|
2013-02-13 15:42:41 +01:00 |
|
fhenry
|
136dc651f3
|
Merge branch 'develop' into develop_merger_cust_prospect_tab
|
2013-02-12 19:18:15 +01:00 |
|
fhenry
|
82fc8e1536
|
Task 350 in Doliforge
|
2013-02-12 19:16:48 +01:00 |
|
Laurent Destailleur
|
3eb485d521
|
Qual: Removed TODO, deprecated code and deprecated properties. This also
fix missing combo box of contacts onto CC.
|
2013-02-12 17:08:21 +01:00 |
|
Laurent Destailleur
|
4c936ffffd
|
Merge pull request #645 from FHenry/dev_contactcombox
Task [ task #711 ]
|
2013-02-12 06:08:04 -08:00 |
|
fhenry
|
d8d4b669ab
|
Task [ task #711 ]
|
2013-02-12 09:49:27 +01:00 |
|
Laurent Destailleur
|
82dda5723b
|
Fix: Disable autocomplete
|
2013-02-12 01:29:26 +01:00 |
|
Laurent Destailleur
|
d2275a0bbd
|
New: Add param to show title
|
2013-02-11 20:26:01 +01:00 |
|
Maxime Kohlhaas
|
717a834e8a
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
|
2013-02-08 13:51:05 +01:00 |
|
Maxime Kohlhaas
|
7c458777cf
|
Task # 559 : product customer prices by quantity, correction
|
2013-02-04 10:21:59 +01:00 |
|
simnandez
|
ad91eab0ac
|
[ task #652 ] Reduce clicks into creaton of orders, invoices, etc.
Uniformize propal code (not use addpropal.php)
|
2013-02-02 18:31:45 +01:00 |
|
Maxime Kohlhaas
|
da066badc8
|
LDAP : no user update for the moment, dev for updating user from ldap is not working yet
|
2013-01-30 16:53:59 +01:00 |
|
Maxime Kohlhaas
|
51800a0dd5
|
Security : add phtml extension to be dealed as php extension
|
2013-01-30 16:52:33 +01:00 |
|
Maxime Kohlhaas
|
a3027d4590
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
|
2013-01-30 16:50:32 +01:00 |
|
Maxime Kohlhaas
|
faccc978b4
|
LDAP : start implementing user update function after LDAP connexion
|
2013-01-30 16:50:28 +01:00 |
|
Laurent Destailleur
|
30764a6c00
|
Fix: Option COMPANY_USE_SEARCH_TO_SELECT was not working for third party
selection when autocomplete is on.
|
2013-01-29 16:14:53 +01:00 |
|
Laurent Destailleur
|
180fb2c91a
|
Fix: Option COMPANY_USE_SEARCH_TO_SELECT was not working for third party
selection when autocomplete is on.
|
2013-01-29 15:22:07 +01:00 |
|
Laurent Destailleur
|
755325dcf0
|
Qual: Removed deprecated file
|
2013-01-28 17:59:35 +01:00 |
|
Laurent Destailleur
|
f4c4a43f57
|
Merge remote-tracking branch 'origin/3.3' into develop
|
2013-01-28 17:31:17 +01:00 |
|
Laurent Destailleur
|
0743049dc4
|
Fix: get list of currencies
|
2013-01-28 14:57:37 +01:00 |
|