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

30273 Commits

Author SHA1 Message Date
Regis Houssin
662d9cfa6e Fix: for avoid problem with multicompany thirdparty sharing 2013-04-11 17:11:15 +02:00
Laurent Destailleur
76c180aaaf Fix: encoding at wrong place 2013-04-10 23:13:55 +02:00
Laurent Destailleur
d570aa02d4 Fix: bad url 2013-04-10 23:11:21 +02:00
Laurent Destailleur
3bcd506e73 Fix: demo modules list 2013-04-10 23:06:38 +02:00
Laurent Destailleur
43d4bb6155 Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3 2013-04-10 19:30:51 +02:00
Laurent Destailleur
72f0ca194c Fix: Solve conflict of translation 2013-04-10 19:28:54 +02:00
Laurent Destailleur
c4d0c4c3e5 Merge pull request #821 from FHenry/3.3 
Fix bug : change path of ODT template for commande and propal module
 2013-04-10 08:15:57 -07:00
fhenry
5d94b0c576 Fix bug : change path of ODT template for commande and propal module 2013-04-10 16:34:06 +02:00
Regis Houssin
19e902ef8f Fix: filter on all contacts, not just those related to a company 2013-04-10 16:00:30 +02:00
Regis Houssin
b80d4874e3 Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3 
Conflicts:
	htdocs/install/mysql/migration/3.2.0-3.3.0.sql
 2013-04-10 15:34:51 +02:00
Regis Houssin
057365b69e Fix: change for experimental encryption 2013-04-10 15:33:03 +02:00
fhenry
38e30836a5 Fix bug with multicompany (SYSLOG_FILE on wrong entity) 2013-04-10 15:08:03 +02:00
Regis Houssin
8118332dfb Fix: security 
Conflicts:
	htdocs/core/modules/mailings/contacts2.modules.php
 2013-04-10 13:00:05 +02:00
Laurent Destailleur
f17ba4814e Merge pull request #816 from FHenry/3.3 
Fix [ bug #810 ] Cannot update ODT template path
 2013-04-08 14:28:51 -07:00
fhenry
98aaec18a7 Fix [ bug #810 ] Cannot update ODT template path 2013-04-08 18:08:38 +02:00
Regis Houssin
f3bbfe375c Fix: for multicompany compatibility 2013-04-08 12:41:48 +02:00
Laurent Destailleur
4ce7a70411 Merge pull request #813 from marcosgdf/3.3 
Removed duplicated code and fixed a problem with orders2invoice
 2013-04-07 14:00:32 -07:00
Marcos García
6013916d45 Removed duplicated code and fixed a problem with orders2invoice 2013-04-07 21:58:24 +02:00
Laurent Destailleur
b678183ff2 Log 2013-04-07 21:09:57 +02:00
Laurent Destailleur
64a9689473 Fix: [ bug #787 ] Invoice supplier box incorrect tooltip when delay on 
payment
 2013-04-07 14:41:42 +02:00
Laurent Destailleur
4ceeea4a1c Fix: Can't reset payment due date 2013-04-07 14:41:08 +02:00
Marcos García
6252857440 Fixed translations and BILL_SUPPLIER_BUILDDOC trigger 2013-04-06 17:56:10 +02:00
Laurent Destailleur
c10f2dd327 Merge pull request #807 from FHenry/3.3_bug794 
Fix [ bug #794 ] Lost filter on zipwode in prospect list
 2013-04-05 13:50:27 -07:00
Laurent Destailleur
bbb0854517 Merge pull request #803 from FHenry/3.3 
Fix[ bug #774 ] Bug on creating event with box "all day" crossed
 2013-04-05 13:49:11 -07:00
fhenry
09d1e56ca5 Fix [ bug #794 ] Lost filter on zipwode in prospect list 2013-04-05 13:01:15 +02:00
fhenry
81b34f9918 Fix Error come from [Dolibarr-dev] Errors on comm/mailing/index.php page 
mail
 2013-04-05 09:23:31 +02:00
fhenry
ef5c03fc99 Fix[ bug #774 ] Bug on creating event with box "all day" crossed 2013-04-04 19:57:16 +02:00
juanjo
61b28274f7 [ bug #790 ] Spanish localtax RE not being correctly calculated 2013-04-04 16:32:06 +02:00
fhenry
be01297403 Fix Ducth (nl_NL) translation 2013-04-03 11:56:54 +02:00
fhenry
9572eebae0 Check style 
(http://www.dolibarr.fr/forum/3-installation/40712-sauvegarde)
 2013-04-02 22:22:57 +02:00
Laurent Destailleur
e0baa0fe46 Generalize fix: file with a specific mask not found, again 
Conflicts:
	htdocs/comm/propal.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/expedition/fiche.php
	htdocs/fichinter/fiche.php
 2013-03-30 14:04:09 +01:00
Regis Houssin
1e3b26a104 Fix: file with a specific mask not found, again 2013-03-29 11:54:22 +01:00
Regis Houssin
888da9f3e9 Fix: file with a specific mask not found 2013-03-29 11:52:18 +01:00
Laurent Destailleur
3c3c0b456e Fix: _ not allowed into prestashop tags. 2013-03-28 09:59:59 +01:00
Laurent Destailleur
e0bf4faa4c Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3 2013-03-27 20:49:30 +01:00
Laurent Destailleur
0108ee2bd8 Fix: Bad name of function 2013-03-27 20:48:57 +01:00
Regis Houssin
c36f52c47a Fix: avoid errors due to BROKEN FEATURES !!! 2013-03-27 11:54:10 +01:00
Regis Houssin
a701cbd77c Fix: wrong var name 2013-03-26 17:47:37 +01:00
Regis Houssin
4fe94b800b Fix: missing parameter 2013-03-26 17:43:48 +01:00
Regis Houssin
dff74667c2 Fix: broken features due to the removal of the trigger FILE_UPLOAD ! 2013-03-26 17:29:40 +01:00
Regis Houssin
33a82c396e Fix: broken feature for use hooks with dol_move_uploaded_file method 2013-03-26 17:12:00 +01:00
Laurent Destailleur
7f4fd06f19 Merge pull request #761 from cbattarel/3.3 
fix getting buying price when creating automatically an order from a proposal
 2013-03-20 07:31:31 -07:00
Christophe Battarel
c7666cbc3d fix getting buying price when creating automatically an order from a proposal (with first option activated in workflow module) 2013-03-20 09:30:13 +01:00
Christophe Battarel
e2f28b6c51 remove experimental commissions module 2013-03-18 15:40:56 +01:00
Laurent Destailleur
8a6adb8a49 Merge pull request #756 from cbattarel/3.3 
various fixes on margin :
 2013-03-18 06:25:54 -07:00
Christophe Battarel
f8291a9efe use ifsql function 2013-03-18 14:18:17 +01:00
Christophe Battarel
e59084cafc various fixes on margin : 
- fix on sortorder
- fix for credit notes
- fix for total
 2013-03-18 13:04:08 +01:00
simnandez
54f963f8ae Trad: Fix: A better fix for status/list of orders. 
There was a confusion because of bad translation key StatusOrderToBill
that in fact mean "StatusOrderDelivered".
 2013-03-16 22:32:03 +01:00
Laurent Destailleur
013b7eca10 Fix: A better fix for status/list of orders. 
There was a confusion because of bad translation key StatusOrderToBill
that in fact mean "StatusOrderDelivered".
More explanation:
http://wiki.dolibarr.org/index.php/Module_Customers_Orders#Life_cycle_.2F_Business_rules
 2013-03-16 17:02:13 +01:00
Laurent Destailleur
d590aa56eb Merge pull request #749 from simnandez/3.3 
Fix: Bad orders list viewstatut filter if expeditons module is disabled
 2013-03-16 07:39:31 -07:00
Laurent Destailleur
1a62cdfbe8 Fix: Use better test to show localtax to avoid problem when switching 
from different country.
 2013-03-15 17:06:42 +01:00
simnandez
c0e5cacafc Fix: Bad orders list viewstatut filter if expeditons module is disabled 2013-03-15 16:18:14 +01:00
Laurent Destailleur
ed85869394 Merge branch '3.3' of https://github.com/Dolibarr/dolibarr.git into 3.3 2013-03-15 14:43:41 +01:00
Laurent Destailleur
a5181a06e4 Merge pull request #747 from grandoc/3.3 
fix trad
 2013-03-15 04:33:02 -07:00
Grand Philippe
36e99e100b fix trad 2013-03-15 12:13:23 +01:00
Laurent Destailleur
63e3b5742c Merge pull request #745 from grandoc/3.3 
fix trad
 2013-03-15 04:02:48 -07:00
Laurent Destailleur
95c9d19d5e Fix: Restore ability to filter on '0' 2013-03-15 11:31:49 +01:00
Grand Philippe
010207532f fix trad 2013-03-15 10:12:40 +01:00
fhenry
72effa3f25 Fix part of bugs [ bug #766 ] 2013-03-15 09:31:11 +01:00
Regis Houssin
d6c18c1789 Fix: for avoid sql errors with predefined export models 2013-03-14 07:08:44 +01:00
Laurent Destailleur
55856bdc36 Merge pull request #741 from grandoc/3.3 
fix trad
 2013-03-13 08:52:56 -07:00
Laurent Destailleur
6fc57fb90d Merge pull request #740 from FHenry/3.3 
Fix syntax error
 2013-03-13 08:52:25 -07:00
Grand Philippe
82297f52c9 fix trad 2013-03-13 14:40:16 +01:00
Grand Philippe
2d09eb6f8c fix trad 2013-03-13 12:22:39 +01:00
Grand Philippe
5ed94ae9be fix trad 2013-03-13 11:10:31 +01:00
fhenry
d4621c3921 Fix syntax error 2013-03-13 10:15:37 +01:00
jfefe
c83691e35a Missing field fk_thirdparty in user webservice 2013-03-12 20:57:58 +01:00
Laurent Destailleur
bb2776f4cc Fix: Bad field 2013-03-12 13:37:34 +01:00
Laurent Destailleur
9c1f70996a Merge pull request #731 from grandoc/3.3 
fix some translations
 2013-03-12 05:27:15 -07:00
simnandez
5c4b537a65 Fix: [ bug #762 ] Bad profit calculation in Reporting 2013-03-12 11:49:15 +01:00
Laurent Destailleur
fe072d992c Fix: WSDL of productorservice was not valid. Normalize field names. 2013-03-12 10:35:24 +01:00
Grand Philippe
dd248e9d58 fix : dyslexia 2013-03-11 17:19:03 +01:00
Grand Philippe
979a36e941 fix some translations 2013-03-11 15:18:24 +01:00
Grand Philippe
06e931632d fix some translations 2013-03-11 14:51:48 +01:00
Laurent Destailleur
710ea872a9 Merge pull request #727 from cbattarel/3.3 
fix wrong value name when updating buyingprice
 2013-03-11 06:25:35 -07:00
Laurent Destailleur
633a15f10d Fix: Usage of order into export broken when filters are used 2013-03-11 14:20:08 +01:00
Christophe Battarel
f620e6948f fix wrong value name when updating buyingprice 2013-03-11 09:08:57 +01:00
Laurent Destailleur
a6ce7bb428 Fix: Regression for negative proposal lines. 
Conflicts:
	htdocs/comm/propal.php
 2013-03-08 10:28:25 +01:00
Laurent Destailleur
44698fcde0 Fix: dol_is_dir may not be loaded, so call fails 2013-03-08 01:53:41 +01:00
Laurent Destailleur
63e1b724cb Merge pull request #718 from FHenry/3.3 
Fix [ bug #753 ] cashdesk : Error message when adding product to basket
 2013-03-07 14:24:13 -08:00
Laurent Destailleur
e97ca67c4a Fix: Several problem with localtax into PDF generation 
Conflicts:
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
	htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
 2013-03-07 19:13:50 +01:00
Laurent Destailleur
668249a195 Fix: We must refresh object also if option MAIN_DISABLE_PDF_AUTOUPDATE 
is 1 (Cyril ZEKSER)
 2013-03-07 18:44:25 +01:00
Laurent Destailleur
a0803e758e Fix: Missing generic translation 2013-03-07 11:25:14 +01:00
Laurent Destailleur
a3244a4b47 Fix: Missing genereic translation 2013-03-07 11:05:20 +01:00
fhenry
25fa2254c1 Fix [ bug #753 ] cashdesk : Error message when adding product to basket 
https://doliforge.org/tracker/?func=detail&aid=753&group_id=144
http://www.dolibarr.fr/forum/526-autres-modules/39315-probleme-avec-point-de-vente
http://www.dolibarr.es/index.php/foro/6-icomo/2080-errores-con-tpv-y-tipos-de-iva
 2013-03-07 10:50:02 +01:00
eldy
9d047d740b Fix: no null into not null field 2013-03-06 21:30:37 +01:00
Laurent Destailleur
1f0dbc698c Merge pull request #714 from FHenry/3.3 
fix [ bug #749 ]
 2013-03-06 10:33:51 -08:00
fhenry
617a71478b fix [ bug #749 ] 2013-03-05 19:05:12 +01:00
Laurent Destailleur
d5822b7fbd Fix: Syntax sql error when adding/editing line of contract and when 
company does not use vat.
 2013-03-05 18:13:27 +01:00
Laurent Destailleur
ae2355fda5 Merge branch '3.3' of https://github.com/Dolibarr/dolibarr.git into 3.3 2013-03-05 12:54:37 +01:00
Laurent Destailleur
555b3a1199 Fix:; Removed warning 2013-03-04 21:00:22 +01:00
Laurent Destailleur
f86cad0580 Fix: Try a fix for IE9 (need to be tested with IE 8, 7 and 10) 2013-03-04 17:36:20 +01:00
fhenry
f793ed83f6 Fix [ bug #747 ] 2013-03-04 15:36:40 +01:00
Laurent Destailleur
ae1e0dff87 Merge pull request #710 from FHenry/3.3 
Fix [ bug #742 ]
 2013-03-03 15:26:50 -08:00
Laurent Destailleur
931b556b69 Fix: sql error 2013-03-04 00:01:38 +01:00
fhenry
b0212fc8e6 Fix [ bug #742 ] 
and translation of constant description
 2013-03-03 21:23:18 +01:00
Laurent Destailleur
924d01249c Prepare 3.3.1 maintenance release 2013-03-02 16:12:06 +01:00
Laurent Destailleur
0f576181be Merge pull request #707 from simnandez/3.3 
Fix: Localtax2 for Spain must be based into buyer
 2013-03-02 07:05:50 -08:00
Laurent Destailleur
81a06507fa Fix: data not refreshed 2013-03-02 16:01:46 +01:00
simnandez
0cb5b3f50c Fix: Localtax2 for Spain must be based into buyer 2013-03-01 20:32:49 +01:00
fhenry
0d0c1e8c14 Fix [ bug #736 ] 2013-02-28 21:18:52 +01:00
fhenry
7952a1f1a5 rool back changes 2013-02-28 21:15:45 +01:00
fhenry
dcf76d7bcb Fix [ bug #736 ] 2013-02-28 21:13:25 +01:00
Regis Houssin
16ad99f8c5 Fix: to force id field name 2013-02-28 19:41:44 +01:00
Regis Houssin
d9b7886ef9 Fix: try to fix regression, stored the last id created in a session 
variable in order to be used to find out information in the "ref_ext" in
order to differentiate automatic actions.
 2013-02-28 18:47:38 +01:00
Laurent Destailleur
d190e924b3 Fix: Update of type was not working. 2013-02-27 19:43:40 +01:00
Laurent Destailleur
8b244b0d61 Fix: select lost if error 2013-02-27 19:21:40 +01:00
Laurent Destailleur
47c89dfd8e Fix: trans 2013-02-27 17:47:51 +01:00
Laurent Destailleur
f2371be191 Fix: Update button does not appear 2013-02-27 15:24:08 +01:00
Laurent Destailleur
283aeb2945 Fix: Add option MAIN_USE_LOCALTAX_TYPE_7 to hide localtax 7 because 
type 7 need to be implemented at invoice level, not line level. This
disable the feature (we need better implementation) without removing it
for people using it in the past.
 2013-02-27 01:06:08 +01:00
Laurent Destailleur
18aff92366 Merge pull request #683 from FHenry/3.3 
Fix [ bug #733 ]
 2013-02-26 11:03:36 -08:00
Laurent Destailleur
c4948ea3db Fix: It seems foreign key is not deleted sometimes. To be sure, we force 
delete also at end.
 2013-02-25 20:23:44 +01:00
fhenry
af6bb94ff3 Merge branch '3.3' of https://github.com/Dolibarr/dolibarr.git into 3.3 2013-02-22 15:02:33 +01:00
fhenry
44b5b98308 Fix [ bug #733 ] 2013-02-22 15:02:06 +01:00
Regis Houssin
ae154ed9a3 Merge branch '3.3' of git+ssh://git@github.com/Dolibarr/dolibarr.git into 3.3 2013-02-22 13:15:41 +01:00
Regis Houssin
b5d2a378fa Fix: pdf models are unstable and time consuming. 2013-02-22 13:14:54 +01:00
Laurent Destailleur
6b50ddf6ec Merge pull request #682 from FHenry/3.3 
Fix bug #730
 2013-02-22 03:45:32 -08:00
Regis Houssin
dd7411593e Fix: wrong hidden 2013-02-22 12:21:49 +01:00
Regis Houssin
3b45cffafa Fix: hide blocs with multi-page 2013-02-22 11:26:23 +01:00
Regis Houssin
20522148f2 Fix: regression, the product discount overwrites the default customer 
discount !
 2013-02-22 11:06:45 +01:00
fhenry
aa473fa3e3 Fix bug #730 2013-02-22 09:42:02 +01:00
simnandez
723c46ec42 Fix: Pagination at bottom not work correctly with filters applied 2013-02-21 14:29:06 +01:00
Laurent Destailleur
3687b29a7b Fix: Missing translation 2013-02-20 21:42:20 +01:00
Laurent Destailleur
402bc48b24 Merge pull request #666 from grandoc/3.3 
fix language
 2013-02-19 01:13:00 -08:00
simnandez
15f6f7c335 Fix: Translation 2013-02-18 17:07:20 +01:00
Grand Philippe
3ce75ce382 fix: bad commit 2013-02-18 16:57:38 +01:00
Grand Philippe
108b4d1ae9 fix language 2013-02-18 16:10:27 +01:00
Laurent Destailleur
b5260e4ab1 Fix: Translation 2013-02-18 14:13:02 +01:00
Laurent Destailleur
f82bec552b Fix: Check id field are mandatory 2013-02-18 13:07:32 +01:00
Laurent Destailleur
d6e907b69b Fix: Nb of holidays was not using correct user 2013-02-17 19:26:33 +01:00
Laurent Destailleur
df2fde3a68 Prepare 3.3 release 2013-02-17 17:17:19 +01:00
Laurent Destailleur
b434f58af3 Fix: When creating invoice from other object, type must be standard only 2013-02-17 17:12:06 +01:00
Laurent Destailleur
d2074d1a17 Fix: When creating invoice from other object, type must be standard only 2013-02-17 17:06:55 +01:00
Laurent Destailleur
aff919fd10 Fix: Bad test 2013-02-17 12:45:46 +01:00
fhenry
f043fcfaf7 Fix bug [ bug #709 ] 2013-02-14 13:55:05 +01:00
Laurent Destailleur
365680d90e Fix: Missing vat rates 2013-02-13 21:25:17 +01:00
Laurent Destailleur
031bc911ea Fix: Mass save or update of const fails. 2013-02-13 16:47:25 +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
c6b263c586 fix bug in contract update line (wrong vat variable name) 2013-02-13 09:53:26 +01: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
fed591d989 Merge pull request #641 from simnandez/3.3 
Fix: Amarok login page issues
 2013-02-10 17:37:38 -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
simnandez
caf6fa2240 Fix: Amarok login page issues 2013-02-10 11:09:21 +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
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
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
ac3ccade98 Fix: number of chars to low to show value. 2013-01-28 13:11:12 +01:00
Laurent Destailleur
a8ccc0ab0b Fix: loghandler loaded twice. 2013-01-28 12:36:15 +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
2002388098 Revert "New: add hook getFormMail" 
This reverts commit c732532483.
 2013-01-26 13:40:31 +01:00
Regis Houssin
e3be718a57 Fix: wrong object name 2013-01-25 12:38:41 +01:00
Maxime Kohlhaas
7facbf7aa2 Multicompany restriction for transverse mode not used anymore. RestrictedArea is enough 2013-01-24 18:12:29 +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
simnandez
03d6903248 Fix: [ bug #698 ] Bad calculation of totals of associated documents 2013-01-24 12:53:42 +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
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
Regis Houssin
beea9c2ec4 Fix: use the users entity 2013-01-23 15:44:51 +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
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
06a0da990b Fix: broken features, special_code also used by externals modules ! 2013-01-22 21:35:15 +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
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
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
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
Laurent Destailleur
e236ac3f03 Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3 2013-01-21 01:07:22 +01:00
Laurent Destailleur
9cf405f9d2 Fix: syntax error 2013-01-21 01:06:52 +01:00
eldy
b3dbbe94e9 Missing div warning 
Conflicts:
	htdocs/admin/index.php
 2013-01-20 16:21:52 +01:00
eldy
d1dc04761a Fix: dev rule to build portable requests 2013-01-20 15:30:51 +01:00
eldy
6ded74d5dd Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3 2013-01-20 15:22:14 +01:00
eldy
fc011610bb Fix: pgsql 2013-01-20 15:21:18 +01:00
jfefe
7a60bd0b3c Fix : missing class / bad user when create thirdparty with contact and 
user by webservice method
 2013-01-20 12:39:26 +01:00
Laurent Destailleur
3551dff18a Fix: [ bug #671 ] Product country origin is automatically entered in 
description of invoices, but not in invoices generated from orders
 2013-01-19 15:57:28 +01:00
Laurent Destailleur
7002b328a8 Fix: [ bug #685 ] Supplier invoices should use encoding sequence number 
as secondary sorting field
 2013-01-19 15:32:03 +01:00
Laurent Destailleur
f701559056 Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3 2013-01-19 14:32:50 +01:00
Laurent Destailleur
0e13b3872d Fix: Removed warnings 2013-01-19 14:32:37 +01:00
Laurent Destailleur
aaa56ce606 Merge pull request #618 from simnandez/3.3 
Fix: Bad Spanish departament name
 2013-01-18 09:30:45 -08:00
Laurent Destailleur
591eab4826 Detect another problem into box. Just add a comment. 2013-01-18 14:22:18 +01:00
Laurent Destailleur
a12972034f Fix: Start to fix some bugs 2013-01-18 13:56:36 +01:00
Laurent Destailleur
7c826dc38d Fix: Bad error management 2013-01-18 12:09:39 +01:00
Laurent Destailleur
57a869683d Fix date function 2013-01-18 11:28:06 +01:00
simnandez
a57f291aa2 Fix: Bad Spanish departament name 2013-01-18 09:28:54 +01:00
Laurent Destailleur
c16269d04e Fix: load at wrong place 
Conflicts:
	htdocs/core/class/html.formother.class.php
 2013-01-17 17:59:47 +01:00
Laurent Destailleur
9d5b36b27b Fix: error set on non object 2013-01-17 17:54:08 +01:00
Laurent Destailleur
3685911bfa Merge pull request #616 from FHenry/3.3 
Fix bug [ bug #694 ] Set security permision to user belong to group
 2013-01-16 11:45:33 -08:00
fhenry
968e980f58 Fix bug [ bug #694 ] Set security permision to user belong to group 2013-01-16 18:58:39 +01:00
simnandez
e820e62c03 Trad: Best ca_ES and es_ES translations 2013-01-16 18:19:48 +01:00