fhenry
|
2af7fd858e
|
Task 714
|
2013-02-14 14:57:37 +01:00 |
|
Laurent Destailleur
|
7ab91b5f42
|
Merge pull request #650 from FHenry/develop_merger_cust_prospect_tab
Develop merger cust prospect tab (Task 350)
|
2013-02-12 11:41:17 -08: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 |
|
fhenry
|
6ad617842d
|
Commit temporaire
|
2013-02-12 15:31:12 +01:00 |
|
Laurent Destailleur
|
6bbac00c22
|
Merge remote-tracking branch 'origin/3.3' into develop
Conflicts:
htdocs/holiday/class/holiday.class.php
htdocs/user/fiche.php
|
2013-02-12 15:17:22 +01:00 |
|
Laurent Destailleur
|
4c936ffffd
|
Merge pull request #645 from FHenry/dev_contactcombox
Task [ task #711 ]
|
2013-02-12 06:08:04 -08:00 |
|
Laurent Destailleur
|
ddf27b2c67
|
Fix Bug 708
|
2013-02-12 15:01:16 +01:00 |
|
Laurent Destailleur
|
8a72ff8fc2
|
Fix: bad translation
|
2013-02-12 14:48:51 +01:00 |
|
Laurent Destailleur
|
112526e8b1
|
Fix: bad translation
|
2013-02-12 14:48:12 +01: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
|
935f2d9bd8
|
Add TODO
|
2013-02-11 21:23:25 +01:00 |
|
Laurent Destailleur
|
c7a6ee492d
|
New: Add push from Philippe to manager user hierarchy.
|
2013-02-11 20:45:36 +01:00 |
|
Laurent Destailleur
|
f1d105b66c
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2013-02-11 20:27:11 +01:00 |
|
Laurent Destailleur
|
597db12acd
|
Merge pull request #644 from simnandez/develop
Fix: Amarok login page issues
|
2013-02-11 11:26:48 -08:00 |
|
Laurent Destailleur
|
4ceeadaa35
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2013-02-11 20:26:18 +01:00 |
|
Laurent Destailleur
|
d2275a0bbd
|
New: Add param to show title
|
2013-02-11 20:26:01 +01:00 |
|
simnandez
|
77c5eaa726
|
Fix: Amarok login page issues
|
2013-02-11 09:13:33 +01:00 |
|
Laurent Destailleur
|
fed591d989
|
Merge pull request #641 from simnandez/3.3
Fix: Amarok login page issues
|
2013-02-10 17:37:38 -08:00 |
|
Laurent Destailleur
|
638871c40c
|
Merge pull request #640 from defrance69/patch-11
Update htdocs/product/class/product.class.php
|
2013-02-10 17:36:27 -08:00 |
|
Laurent Destailleur
|
b112b7d87e
|
Merge pull request #638 from grandoc/develop
useless file
|
2013-02-10 17:35:27 -08:00 |
|
Laurent Destailleur
|
4d9f22c909
|
Renamed "Salvador" into "El Salvador"
|
2013-02-10 22:09:25 +01:00 |
|
Laurent Destailleur
|
e5e9dc404b
|
Fix: Bad choice of template
|
2013-02-10 21:57:53 +01:00 |
|
Laurent Destailleur
|
49f40ee429
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2013-02-10 21:56:44 +01:00 |
|
Laurent Destailleur
|
28fa96b516
|
Fix: Bad choice of template
|
2013-02-10 21:56:29 +01:00 |
|
simnandez
|
caf6fa2240
|
Fix: Amarok login page issues
|
2013-02-10 11:09:21 +01:00 |
|
BENKE Charles
|
f084bbbb19
|
Update htdocs/product/class/product.class.php
bug on list of childs of product
if two products have the same label, the list display only one line
|
2013-02-08 21:21:25 +01:00 |
|
Laurent Destailleur
|
830a5873e2
|
Merge pull request #637 from simnandez/develop
[ task #652 ] Reduce clicks into creaton of orders, invoices, etc.
|
2013-02-07 16:31:20 -08:00 |
|
Grand Philippe
|
b492c7e754
|
fix some translations
|
2013-02-04 09:53:42 +01:00 |
|
Grand Philippe
|
4a4c7e9ca9
|
useless file
|
2013-02-04 08:54:04 +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 |
|
Laurent Destailleur
|
cdb4e7dbf4
|
Merge pull request #636 from simnandez/develop
Trad: Add missing translations
|
2013-02-01 10:11:04 -08:00 |
|
simnandez
|
a9de14c145
|
Trad: Add missing translations
|
2013-02-01 17:49:41 +01:00 |
|
Laurent Destailleur
|
36eb0f01d8
|
Merge pull request #635 from simnandez/3.3
Trad: Add missing translations
|
2013-02-01 08:36:07 -08:00 |
|
Laurent Destailleur
|
1e74ac24ab
|
Move message at bottom.
|
2013-02-01 17:34:19 +01:00 |
|
Laurent Destailleur
|
72c5652a4a
|
Fix: Holiday module update always done
|
2013-02-01 10:13:42 +01:00 |
|
Laurent Destailleur
|
9f7a06e04d
|
Fix: Test not complete
|
2013-02-01 09:56:45 +01:00 |
|
simnandez
|
7134ab5594
|
Trad: Add missing translations
|
2013-02-01 09:28:02 +01:00 |
|
Laurent Destailleur
|
50fcf9b194
|
Merge pull request #633 from atm-maxime/develop
Develop
|
2013-01-31 02:09:30 -08:00 |
|
Laurent Destailleur
|
26c66a11ed
|
Fix: Bug 701
|
2013-01-31 10:21:34 +01:00 |
|
Maxime Kohlhaas
|
66376f1c83
|
Bug # 701 : A user can only be set admin by an admin
|
2013-01-31 09:56:52 +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
|
2300b9d3db
|
Merge remote-tracking branch 'origin/3.3' into develop
|
2013-01-30 15:25:02 +01:00 |
|
Laurent Destailleur
|
7ee530f826
|
New: Add field to store hierarchy of users.
|
2013-01-30 15:23:49 +01:00 |
|
Laurent Destailleur
|
69f057c734
|
Merge pull request #632 from FHenry/3.3
Fix bug
|
2013-01-29 13:12:57 -08:00 |
|