Laurent Destailleur
|
8b77005eae
|
Merge pull request #605 from FHenry/develop
remove dummy line
|
2013-01-13 11:59:14 -08:00 |
|
fhenry
|
b9c53fd796
|
remove dummy line
|
2013-01-13 20:50:54 +01:00 |
|
Laurent Destailleur
|
ff24a7df67
|
New: Add script to detect DOS (non Linux) files.
|
2013-01-13 19:34:43 +01:00 |
|
Laurent Destailleur
|
29e6d01e51
|
Merge remote-tracking branch 'origin/3.3' into develop
Conflicts:
htdocs/core/tpl/freeproductline_create.tpl.php
htdocs/core/tpl/predefinedproductline_create.tpl.php
|
2013-01-13 19:33:54 +01:00 |
|
Laurent Destailleur
|
0f6506d457
|
Fix: not object error with option SERVICE_ARE_ECOMMERCE_200238EC
|
2013-01-13 18:57:55 +01:00 |
|
Laurent Destailleur
|
8ff12f7d55
|
Merge pull request #604 from simnandez/develop
[ task #652 ] Reduce clicks into creaton of orders, invoices, etc.
|
2013-01-13 07:01:28 -08:00 |
|
Laurent Destailleur
|
1d95c68a74
|
Update 2013
|
2013-01-13 14:38:05 +01:00 |
|
simnandez
|
ffbb611eb4
|
[ task #652 ] Reduce clicks into creaton of orders, invoices, etc.
|
2013-01-13 10:57:39 +01:00 |
|
simnandez
|
b1369a2f01
|
[ task #652 ] Reduce clicks into creaton of orders, invoices, etc.
|
2013-01-12 22:08:52 +01:00 |
|
Laurent Destailleur
|
980bfde83e
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2013-01-12 19:59:09 +01:00 |
|
Laurent Destailleur
|
c9a6da610d
|
To allow module to use ckeditor/config.js
|
2013-01-12 16:00:38 +01:00 |
|
Laurent Destailleur
|
1bed4aa193
|
Merge pull request #602 from FHenry/develop
Add boolean (checkbox) standard extrafield feature
|
2013-01-12 06:53:48 -08:00 |
|
Laurent Destailleur
|
8152dda733
|
Merge pull request #601 from simnandez/develop
[ task #652 ] Reduce clicks into creaton of orders, invoices, etc.
|
2013-01-12 06:45:34 -08:00 |
|
Laurent Destailleur
|
979ea42d3f
|
Comments
|
2013-01-12 15:40:38 +01:00 |
|
Laurent Destailleur
|
054a9b7447
|
Merge pull request #600 from marcosgdf/test
Added tests for Adherent class functions
|
2013-01-12 06:36:14 -08:00 |
|
fhenry
|
2cdeb95b67
|
Set member id on create not by sql request after.
Mandatory for trigger USER_CREATE to do action if user is member
|
2013-01-12 15:16:38 +01:00 |
|
Laurent Destailleur
|
ec8b260bf6
|
New: Prepare 3.4 branch
New: Add hook for agenda, info and category tabs
|
2013-01-12 14:34:16 +01:00 |
|
Marcos García
|
aff96e5050
|
Added test for functions fetch_login and resiliate
|
2013-01-12 14:14:36 +01:00 |
|
fhenry
|
d39368fd36
|
Add boolean (checkbox) standard extrafield feature
|
2013-01-12 14:02:39 +01:00 |
|
simnandez
|
96c5eacf4a
|
[ task #652 ] Reduce clicks into creaton of orders, invoices, etc.
|
2013-01-12 09:58:21 +01:00 |
|
Marcos García
|
729a8017c3
|
Added test for Adherent class functions setUserId and setThirdPartyId
|
2013-01-11 17:13:37 +01:00 |
|
Laurent Destailleur
|
22dcb7ee6a
|
Merge pull request #599 from cbattarel/develop
show costprice instead of buyingprice if setup of margin module is costprice
|
2013-01-11 06:50:58 -08:00 |
|
Laurent Destailleur
|
a30dd12cc0
|
Merge pull request #598 from cbattarel/3.3
show costprice instead of buyingprice if setup of margin module is costprice
|
2013-01-11 06:50:35 -08:00 |
|
Christophe Battarel
|
62ccb57857
|
fix missing td
|
2013-01-11 15:41:47 +01:00 |
|
Christophe Battarel
|
49703240f7
|
show costprice instead of buyingprice if setup of margin module is costprice
|
2013-01-11 15:39:11 +01:00 |
|
Christophe Battarel
|
38e9290729
|
show costprice instead of buyingprice if setup of margin module is costprice
|
2013-01-11 15:33:34 +01:00 |
|
Regis Houssin
|
ee0db5f67b
|
Merge pull request #597 from FHenry/develop
Update method in thirdparty web service
|
2013-01-10 14:32:17 -08:00 |
|
fhenry
|
10ed8c141e
|
Update method in thirdparty web service
|
2013-01-10 23:30:26 +01:00 |
|
Laurent Destailleur
|
37b6bab893
|
Fix: Missing lang loading
|
2013-01-10 22:45:55 +01:00 |
|
Laurent Destailleur
|
14dede1a74
|
Fix: Protection to avoid renaming a user with a login that already
exists.
|
2013-01-10 21:32:10 +01:00 |
|
Laurent Destailleur
|
049bf1ee00
|
Merge pull request #594 from marcosgdf/doc-typo
Fixed typos in console message
|
2013-01-10 12:14:24 -08:00 |
|
Laurent Destailleur
|
5b4f1d39be
|
Merge pull request #591 from marcosgdf/test
Improved AdherentTest and added testAdherentMakeSubstitution
|
2013-01-10 12:13:53 -08:00 |
|
Laurent Destailleur
|
03b906808e
|
Merge pull request #593 from marcosgdf/eu-vat
Updated EU VAT area links and added Isle of Man
|
2013-01-10 12:12:25 -08:00 |
|
Laurent Destailleur
|
9251d9a6ac
|
Merge pull request #592 from marcosgdf/minor
Minor changes related to commit 8ac33e9
|
2013-01-10 12:10:49 -08:00 |
|
Laurent Destailleur
|
275cecccbc
|
Merge pull request #587 from marcosgdf/translations
Fixed problems with translations
|
2013-01-10 12:09:45 -08:00 |
|
Laurent Destailleur
|
3c6e4bc267
|
Merge pull request #590 from marcosgdf/3.3
Fix bug in Adherent class not saving civilite=0
|
2013-01-10 12:09:23 -08:00 |
|
Laurent Destailleur
|
941afd7545
|
Fix: Because of autocomplete, password was changed when we changed
login.
|
2013-01-10 20:12:14 +01:00 |
|
Laurent Destailleur
|
0c7b469192
|
Fix: Session was lost when user change its own login.
|
2013-01-10 20:07:44 +01:00 |
|
Laurent Destailleur
|
63cd0e8984
|
First try to include svg into css.
|
2013-01-10 18:50:07 +01:00 |
|
Laurent Destailleur
|
de03f57620
|
Fix: Translation
|
2013-01-10 18:02:06 +01:00 |
|
Marcos García
|
9d57ea7cd0
|
Fixed typo in console message
|
2013-01-10 16:24:07 +01:00 |
|
Laurent Destailleur
|
eb078e6c8a
|
Fix: Missing css entries. Solve look of ecm module.
|
2013-01-10 16:06:13 +01:00 |
|
Laurent Destailleur
|
a1282f5236
|
Fix: Navigation into projects
|
2013-01-10 16:04:23 +01:00 |
|
Marcos García
|
8e7a66a544
|
Fixed indentation problem
|
2013-01-10 14:20:03 +01:00 |
|
Marcos García
|
809367d23b
|
Updated EU VAT area links and added Isle of Man
Isle of Man is in included in UK state as shown in http://ec.europa.eu/taxation_customs/common/faq/faq_1179_en.htm#9
|
2013-01-10 14:17:43 +01:00 |
|
Marcos García
|
593db37423
|
Function getTotalDiscount of commonobject.class.php should always return a float for precission
|
2013-01-10 13:53:46 +01:00 |
|
Marcos García
|
acd4e8f747
|
Updated changelog with renamed ODT tag
|
2013-01-10 13:51:52 +01:00 |
|
Laurent Destailleur
|
8ac33e98e7
|
Fix: property object_total_discount was not working when quantity was
not 1.
|
2013-01-10 12:58:46 +01:00 |
|
Marcos García
|
88fdfec0eb
|
Improved AdherentTest and added testAdherentMakeSubstitution
|
2013-01-10 12:26:02 +01:00 |
|
Marcos García
|
e6e183aad4
|
Fix bug in Adherent class not saving civilite=0
|
2013-01-10 12:03:08 +01:00 |
|