Laurent Destailleur
e56e182fe9
Fix: When creating invoice from other object, type must be "standard".
2013-02-17 16:37:28 +01:00
Laurent Destailleur
9f8ffe242a
Fix: A text field can not have a default value
2013-02-17 16:26:06 +01:00
Laurent Destailleur
aa8413d7cb
Fix: Missing migration
...
Fix: Error management
2013-02-17 16:20:49 +01:00
Laurent Destailleur
aff919fd10
Fix: Bad test
2013-02-17 12:45:46 +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
42b37c081a
Merge pull request #648 from cbattarel/fix_contact_address_autofill
...
fix contact address autofill
2013-02-16 14:19:08 -08:00
Laurent Destailleur
fdf8c9dc43
Merge pull request #657 from defrance69/patch-12
...
Update htdocs/product/class/product.class.php
2013-02-16 14:18:17 -08:00
Laurent Destailleur
4dca883f21
Merge pull request #655 from FHenry/develop
...
Task 714 and Fix bug on task 350
2013-02-16 14:16:08 -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
4f5b636cc7
Fix : missing class file
2013-02-16 13:58:21 +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
785e72d533
fix trad : change adresse versus address
2013-02-15 19:36:09 +01:00
Grand Philippe
2bfd6c40d0
fix trad : change adresse versus address
2013-02-15 19:26:09 +01:00
Grand Philippe
12317d0371
fix trad : change adresse versus address
2013-02-15 19:18:26 +01:00
Laurent Destailleur
b1ee14ce60
New: Can define a hierarchical responsible on users.
2013-02-15 18:39:27 +01:00
Laurent Destailleur
145573ea79
Qual: Removed useless code for old modules. There is hook now to do same
...
job.
2013-02-15 17:37:30 +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
Grand Philippe
cddd59d98d
fix : doesnt work with a \/
2013-02-15 14:23:35 +01:00
jfefe
3d8197ce4b
Work on extrafields : position management & new type : select list
2013-02-15 11:19:49 +01:00
Laurent Destailleur
7b9fc49dea
More CSS3
2013-02-15 10:46:50 +01:00
Laurent Destailleur
71b814156b
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-02-15 10:42:50 +01:00
Laurent Destailleur
bbb18b3175
Look: More CSS3
2013-02-15 10:42:35 +01:00
BENKE Charles
f847558363
Update htdocs/product/class/product.class.php
...
fetch_prod_arbo / recursive call of the child product test
2013-02-15 07:21:10 +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
fhenry
f65f0e3f11
Remove debug string in buf correction of task 350
2013-02-14 15:27:48 +01:00
fhenry
d41e754f43
Fix bug on task 350
2013-02-14 15:08:22 +01:00
fhenry
ebf002d79e
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-02-14 14:59:24 +01:00
fhenry
2af7fd858e
Task 714
2013-02-14 14:57:37 +01:00
fhenry
f043fcfaf7
Fix bug [ bug #709 ]
2013-02-14 13:55:05 +01:00
jfefe
3780d0fde6
New webservice method to change user password
2013-02-14 13:15:55 +01:00
jfefe
e2d03a9dba
Add possibility to disable hook on list of recent file
2013-02-14 13:15:23 +01:00
Laurent Destailleur
365680d90e
Fix: Missing vat rates
2013-02-13 21:25:17 +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
031bc911ea
Fix: Mass save or update of const fails.
2013-02-13 16:47:25 +01:00
Laurent Destailleur
f869004b95
Fix: Mass save or update of const fails.
2013-02-13 16:46:28 +01:00
Laurent Destailleur
7d1c51ab77
Add option MAIN_PDF_TITLE_BACKGROUND_COLOR
2013-02-13 16:45:53 +01:00
Maxime Kohlhaas
1cfd32680a
Fix : set some vars when invoice is back to draft status
2013-02-13 15:43:27 +01:00
Maxime Kohlhaas
bfc5cfebce
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
2013-02-13 15:42:41 +01:00
Laurent Destailleur
caec1429b1
Fix: Uniformize database type according to page http://
2013-02-13 15:19:03 +01:00
Laurent Destailleur
2dce0c68e8
Merge pull request #652 from cbattarel/3.3
...
3.3 : fix bug in contract update line (wrong vat variable name)
2013-02-13 05:56:09 -08:00
Christophe Battarel
4f33249c9e
margin management on contract card
2013-02-13 10:35:47 +01:00
Christophe Battarel
c6b263c586
fix bug in contract update line (wrong vat variable name)
2013-02-13 09:53:26 +01:00
Christophe Battarel
44134dec57
prepare contract class for margin management
2013-02-13 09:50:08 +01:00
Christophe Battarel
b372a8c5ba
prepare db for margin on contracts
2013-02-13 08:59:40 +01:00
Christophe Battarel
5c9950f486
prepare db for margin on contracts
2013-02-13 08:55:16 +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
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
Christophe Battarel
af849a5ab0
fix contact address autofill
2013-02-12 10:33:10 +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
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
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
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
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
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
fhenry
96efa87708
Fix bug
...
"A user can always read its own card" false today for external user even
if user get right to change his won info
2013-01-29 20:05:08 +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
ab82a293e9
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-01-29 15:25:00 +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
Regis Houssin
715443e0b0
Merge pull request #631 from jfefe/webservices
...
Fix : wrong value for contact_id when call getUser webservice method
2013-01-29 01:25:33 -08:00
jfefe
ed92e91cc0
Fix : wrong value for contact_id when call getUser webservice method (contact_id is variable name in user.class)
2013-01-29 03:59:23 +01:00
Regis Houssin
a177853299
Fix: la bétise n'a pas de limite ! restons archaïque.
2013-01-28 20:30:33 +01:00
Laurent Destailleur
a268592b61
Qual: Clean not used library.
2013-01-28 18:01:50 +01:00
Laurent Destailleur
755325dcf0
Qual: Removed deprecated file
2013-01-28 17:59:35 +01:00
Laurent Destailleur
0383080d90
Fix: bad menu file name
2013-01-28 17:37:40 +01:00
Laurent Destailleur
f4c4a43f57
Merge remote-tracking branch 'origin/3.3' into develop
2013-01-28 17:31:17 +01:00
Laurent Destailleur
9eaf8af341
Fix: Removed warning (this can be normal behaviour)
...
Fix: menu manager name has changed
2013-01-28 15:35:29 +01:00
Laurent Destailleur
0743049dc4
Fix: get list of currencies
2013-01-28 14:57:37 +01:00
Laurent Destailleur
c42a0c5b03
Fix: removed warning
2013-01-28 14:40:15 +01:00
Laurent Destailleur
ac3ccade98
Fix: number of chars to low to show value.
2013-01-28 13:11:12 +01:00
Laurent Destailleur
0beea6c23c
Merge remote-tracking branch 'origin/3.3' into develop
...
Conflicts:
htdocs/install/inc.php
2013-01-28 12:58:16 +01:00
Laurent Destailleur
a8ccc0ab0b
Fix: loghandler loaded twice.
2013-01-28 12:36:15 +01:00
Laurent Destailleur
db38c9baac
Fix: loghandler loaded twice
2013-01-28 12:35:29 +01:00
Laurent Destailleur
b98151db94
Fix: A log handler can be loaded twice.
2013-01-28 12:22:12 +01:00
Laurent Destailleur
abd8aea06b
Fix: Log not reported
...
Fix: charset not correctly forced
Conflicts:
htdocs/install/inc.php
2013-01-28 11:56:45 +01:00
Laurent Destailleur
eeba48f9b0
Fix: Log not reported
...
Fix: charset not correctly forced
2013-01-28 11:43:49 +01:00
Laurent Destailleur
1b8634588f
Fix: Missing property
2013-01-28 11:31:44 +01:00
Laurent Destailleur
dde8738999
Qual: Add a protection to detect bad usage of getStaticMember
2013-01-28 11:30:28 +01:00
Laurent Destailleur
2002388098
Revert "New: add hook getFormMail"
...
This reverts commit c732532483
2013-01-26 13:40:31 +01:00
Regis Houssin
647cbb08fb
Fix: wrong EOL
2013-01-26 10:38:11 +01:00
Regis Houssin
fcee35c65d
Fix: $hookmanager is a global object
2013-01-26 10:35:30 +01:00
Laurent Destailleur
64cac3194c
Fix: Use translation of NPR
2013-01-25 19:19:41 +01:00
Laurent Destailleur
56e11e52fa
New: hookmanager class is used frequently and is a factory object, so we
...
can move it during init of environment and use it globally.
2013-01-25 19:12:54 +01:00
Laurent Destailleur
1cc949777f
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-01-25 17:46:42 +01:00
Laurent Destailleur
c2d334624b
Qual: Simplify system for menu manager. Only one file, one class per
...
manager.
2013-01-25 17:44:23 +01:00
Regis Houssin
e3be718a57
Fix: wrong object name
2013-01-25 12:38:41 +01:00
Regis Houssin
7983b1dec5
Fix: wrong object name
2013-01-25 12:37:03 +01:00
simnandez
ad3645f7f4
Fix: [ bug #698 ] Bad calculation of totals of associated documents
2013-01-25 11:37:30 +01:00
Laurent Destailleur
70b21172f9
Qual: Removed not used and deprecated property
2013-01-25 11:05:44 +01:00
Maxime Kohlhaas
7facbf7aa2
Multicompany restriction for transverse mode not used anymore. RestrictedArea is enough
2013-01-24 18:12:29 +01:00
Maxime Kohlhaas
8ab450f69b
Multicompany restriction for transverse mode not used anymore. RestrictedArea is enough
2013-01-24 17:54:51 +01:00
Regis Houssin
6089ba614e
Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop
2013-01-24 17:32:52 +01:00
Regis Houssin
b50a9415df
Merge branch '3.3' of git+ssh://git@github.com/Dolibarr/dolibarr.git into 3.3
2013-01-24 17:31:51 +01:00
Regis Houssin
c688e2afab
New: add hook getFormMail
2013-01-24 17:31:22 +01:00
Regis Houssin
c732532483
New: add hook getFormMail
2013-01-24 17:29:11 +01:00
simnandez
03d6903248
Fix: [ bug #698 ] Bad calculation of totals of associated documents
2013-01-24 12:53:42 +01:00
Laurent Destailleur
9f44161e55
New: Can attach file for trip and expenses module
2013-01-24 12:47:06 +01:00
Laurent Destailleur
8682d3c928
Fix: Note not visible
2013-01-24 12:16:00 +01:00
Laurent Destailleur
fa2e9cbd4f
Exclude external modules
2013-01-24 10:06:39 +01:00
Laurent Destailleur
0db303ca59
Merge remote-tracking branch 'origin/3.3' into develop
2013-01-23 23:35:39 +01:00
Laurent Destailleur
3472282703
Fix: [ bug #667 ] Customer categories wrong tree shown after update
...
3.2->3.3
2013-01-23 23:34:43 +01:00
Regis Houssin
efadc2c75c
Fix: remove unused support
2013-01-23 21:04:41 +01:00
fhenry
848bb5417d
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-01-23 19:46:44 +01:00
fhenry
7fcf206603
Add SparkAngel Support for Open-concept.pro
2013-01-23 19:46:28 +01:00
Laurent Destailleur
a7d41d74e8
Merge remote-tracking branch 'origin/3.3' into develop
2013-01-23 18:09:05 +01:00
Laurent Destailleur
5e42a9ff8a
Fix: Revert again another fix that was not correct. It was no more
...
possible to edit a user even if user has permission for.
If module multicompany does not exists (standard mode), no
other test must be added to the if, except the $canxxx test.
2013-01-23 18:08:11 +01:00
Laurent Destailleur
73380b181c
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-01-23 17:35:57 +01:00
