lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
35,296 Commits 43 Branches 150 Tags 886 MiB
7aca87ea40
Commit Graph

35296 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Regis Houssin
3155e92cb1 Merge pull request #627 from FHenry/develop 
Add SparkAngel Support for Open-concept.pro
 2013-01-23 11:55:28 -08: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
Regis Houssin
2726cb13d3 Merge pull request #626 from jfefe/webservices 
Webservices
 2013-01-23 08:29:32 -08:00
jfefe
9b28f98119 Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into webservices 2013-01-23 16:39:49 +01:00
jfefe
c7df80a6b5 Add extrafields for webservice contact / missing fields 2013-01-23 16:34:21 +01:00
Regis Houssin
beea9c2ec4 Fix: use the users entity 2013-01-23 15:44:51 +01:00
Regis Houssin
9203cce485 Fix: use the users entity 2013-01-23 15:41:17 +01:00
Regis Houssin
4a0bc90d5a Fix: only once superadmin and an admin can not delete/modify a 
superadmin
 2013-01-23 15:27:36 +01:00
Regis Houssin
459adb146c Fix: only once superadmin and an admin can not delete/modify a 
superadmin
 2013-01-23 15:26:18 +01:00
Regis Houssin
b12101a650 Fix: only once superadmin if no multicompany setup 2013-01-23 15:11:33 +01:00
Laurent Destailleur
f159660970 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-01-23 14:55:57 +01:00
Laurent Destailleur
7b1e15f340 New: Allow to use upgrade script to upgrade sql of modules 2013-01-23 14:51:15 +01:00
Regis Houssin
9868880142 Fix: missing files library 2013-01-23 11:29:58 +01:00
Regis Houssin
173740157f Merge branch '3.3' of git+ssh://git@github.com/Dolibarr/dolibarr.git into 3.3 2013-01-23 11:28:49 +01:00
Regis Houssin
c66c02e745 Fix: missing files library 2013-01-23 11:28:11 +01:00
Laurent Destailleur
5f2af00397 Add logs to debug 2013-01-23 00:24:20 +01:00
Regis Houssin
e8ce9cecf2 Fix: broken features, special_code also used by externals modules ! 2013-01-22 21:36:30 +01:00
Regis Houssin
06a0da990b Fix: broken features, special_code also used by externals modules ! 2013-01-22 21:35:15 +01:00
Laurent Destailleur
d2152a8342 Restore correct code: A module decide if standard code is used or not 
after running by a return code that is an int 
0=execute standard code, 1=disable standard code

To return a string to show or an array or error codes, this must be done
by setting
$actionclassinstance->results
or
$actionclassinstance->resprints
 2013-01-22 18:15:51 +01:00
Regis Houssin
7b04da43c1 Merge branch '3.3' of git+ssh://git@github.com/Dolibarr/dolibarr.git into 3.3 2013-01-22 18:07:22 +01:00
Regis Houssin
bfe57b21b0 Fix: disable "datetimepicker" from edit in place for the moment 2013-01-22 18:05:41 +01:00
Regis Houssin
a019b1c854 Fix: disable "datetimepicker" from edit in place for the moment 2013-01-22 18:04:04 +01:00
Laurent Destailleur
b0c1137397 Restore correct code: A module decide if standard code is used or not 
after running by a return code that is an int 
0=execute standard code, 1=disable standard code

To return a string to show or an array or error codes, this must be done
by setting
$actionclassinstance->results
or
$actionclassinstance->resprints
 2013-01-22 17:43:41 +01:00
Laurent Destailleur
d622078d08 Merge branch '3.3' of https://github.com/Dolibarr/dolibarr.git into 3.3 2013-01-22 17:14:44 +01:00
Regis Houssin
910543c5b9 Fix: broken feature 2013-01-22 16:53:39 +01:00
Regis Houssin
f0361b9c4c Fix: broken feature 2013-01-22 16:51:10 +01:00
Laurent Destailleur
ec76127625 Fix: http://www.dolibarr.fr/forum/12-howto--aide/28089-adherents--tiers 
Fix: Update member
 2013-01-22 15:14:46 +01:00
Regis Houssin
131dd663cb Fix: missing webservices and code more simple 2013-01-22 11:28:53 +01:00
Laurent Destailleur
d5a3649d72 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-01-21 23:42:03 +01:00
Regis Houssin
92849ae039 Fix: $modules not loaded 2013-01-21 18:20:14 +01:00
Regis Houssin
12f4be9444 Merge pull request #625 from jfefe/webservices 
fix in webservices
 2013-01-21 06:21:57 -08:00
jfefe
a03099bd58 Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into webservices 2013-01-21 15:13:43 +01:00
jfefe
2276addef7 Fix : bad value for order line's price when creating an order by webservice / remove duplicate code 2013-01-21 15:13:08 +01:00
Laurent Destailleur
2f7292aa78 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-01-21 15:04:58 +01:00
Laurent Destailleur
3faa2b558f Renamed param. 2013-01-21 15:04:34 +01:00
Regis Houssin
71dd160c41 Fix: uniformize name 2013-01-21 14:35:49 +01:00
Regis Houssin
5b34f6ba4e Merge pull request #622 from jfefe/webservices 
Missing societe_id for user when called by webservice
 2013-01-21 05:33:14 -08:00
Regis Houssin
84af1dc488 Merge pull request #624 from FHenry/develop 
Force get list of extrafield even if external module manage extrafield
 2013-01-21 05:32:04 -08:00
Regis Houssin
a9b0469f7d Merge pull request #623 from FHenry/3.3 
3.3
 2013-01-21 05:31:44 -08:00
fhenry
7cc548db31 Force get list of extrafield even if external module manage extrafield 2013-01-21 13:52:59 +01:00
fhenry
91e86c5a59 Merge branch '3.3' of https://github.com/Dolibarr/dolibarr.git into 3.3 2013-01-21 13:48:29 +01:00
fhenry
bc8c36b08f Add parameters force get Extarfield list from ll_extrafield even if 
external extrafield module is enabled
 2013-01-21 13:48:15 +01:00
jfefe
a201d8cea0 Fix : bad classname in webservice to create an order 2013-01-21 11:43:22 +01:00
jfefe
8d8e649646 Rename societe_id -> id_thirdparty in webservice method to get an user 2013-01-21 11:42:25 +01:00