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
Laurent Destailleur
8d206fdfb0 Prepare move to other licence. For the moment all answers for licence 
upgrade were not yet received. So we prepare for GPL by uniformizing
licence text keys to GPL-3+. Will move later to AGPL if all answers are
positive.
 2013-01-16 15:36:08 +01:00
Laurent Destailleur
5497b93247 Fix: Removed warning 2013-01-16 13:43:25 +01:00
Laurent Destailleur
a92b1d8677 Merge pull request #613 from FHenry/3.3 
Fix bug 692, 681
 2013-01-15 14:14:49 -08:00
fhenry
ff06b05b3d Fix Bug [ bug #681 ] Can't modify a line a business proposal 2013-01-15 23:04:42 +01:00
fhenry
b8dfee2a3b Fix bug [ bug #692 ] Can't search for suppliers invoice 2013-01-15 23:03:03 +01:00
Regis Houssin
6d882c18de Merge pull request #610 from FHenry/3.3 
Remove bad retrun parameters
 2013-01-15 10:23:12 -08:00
Laurent Destailleur
3b8e99dd4e Fix: Bad menu def 2013-01-15 18:49:53 +01:00
fhenry
b6b9f06a72 Remove bad retrun parameters 2013-01-15 18:32:14 +01:00
Laurent Destailleur
1851aa4646 Fix: Move not stable feature as experimental. Disabled box by default 
because there is still some bug (pgsl support, filters) and major
problem to solve (it slow down seriously Dolibarr, result not accurate
for some status).
 2013-01-15 15:26:46 +01:00
Laurent Destailleur
0c6c2eca8a Fix: Removed warning 2013-01-15 13:11:36 +01:00
Laurent Destailleur
086b223c81 Merge branch '3.3' of https://github.com/Dolibarr/dolibarr.git into 3.3 2013-01-15 11:50:15 +01:00
Laurent Destailleur
11bb3d0137 Fix: Several fixes into boxes management: boxes was loaded twice, logs 
were wrong, global conf missing.
 2013-01-15 11:35:10 +01:00
fhenry
52b4d98849 remove parenthesis not usefull 2013-01-15 11:11:24 +01:00
fhenry
f214c06b1e Add option to fecth extrafield even if extranal extrafield module is 
enabled. Usefull for web service to fetch optionnal from llx_extrafields
even if record or update is manage by hook with external module
 2013-01-15 10:20:19 +01:00
Laurent Destailleur
285bcbecb7 Fix: init of new syslog handler system 2013-01-14 17:12:13 +01:00
Laurent Destailleur
49313fff3b Fix: External user should not see boxes of modules not allowed to 
external users.
 2013-01-14 13:06:08 +01:00
Laurent Destailleur
b9dc76ebaf Fix: List of contacts when connected as external user. 2013-01-14 12:27:19 +01:00
Laurent Destailleur
0861fbfeb6 Fix: Missing kenya currency 2013-01-13 23:47:23 +01:00
Laurent Destailleur
0f6506d457 Fix: not object error with option SERVICE_ARE_ECOMMERCE_200238EC 2013-01-13 18:57:55 +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
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
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
de03f57620 Fix: Translation 2013-01-10 18:02:06 +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
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
e6e183aad4 Fix bug in Adherent class not saving civilite=0 2013-01-10 12:03:08 +01:00
Marcos García
be40114541 Fixed translation problems with Prelevement module 2013-01-09 21:33:55 +01:00
Marcos García
a1e17978d1 Little es_ES typo (again) 2013-01-09 21:24:40 +01:00
Marcos García
7b1aed65cf Little es_ES typo 2013-01-09 21:23:50 +01:00
Marcos García
3f42c198db Little typo in es_ES translation 2013-01-09 20:53:28 +01:00
fhenry
e369d5dfd8 Fix [ bug #668 ] Event created with a profile is not visible by the same 
profile
 2013-01-09 20:34:36 +01:00
Laurent Destailleur
abccfdd168 Fix: Option SERVICE_ARE_ECOMMERCE_200238EC 2013-01-09 19:56:43 +01:00
Laurent Destailleur
24b50b8ed3 Fix: Example an label of category import 2013-01-09 13:29:12 +01:00
Laurent Destailleur
4a2a8e438d Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3 2013-01-09 11:45:04 +01:00
Laurent Destailleur
7114ae33fe Fix: Doc not uptodate 2013-01-09 11:44:45 +01:00
Laurent Destailleur
e31aedbc50 Merge pull request #584 from jfefe/3.3 
Fix bug #666 : error when sending intervention card
 2013-01-09 02:23:00 -08:00
Regis Houssin
a7ed40b10d Fix: empty value if combobox disabled 2013-01-09 10:43:21 +01:00
jfefe
1a3cecfae5 Fix bug #666 : error when sending intervention card 2013-01-09 06:30:27 +01:00
Laurent Destailleur
64d2a662de Merge pull request #582 from marcosgdf/translations 
Improvements in translations
 2013-01-08 14:03:52 -08:00
Laurent Destailleur
f3df7a2fec Fix: An easier to understand fix. Remove also not recommanded "continue 
2" instructions.
 2013-01-08 22:59:36 +01:00
Laurent Destailleur
1555bb681c Merge pull request #581 from simnandez/3.3 
Fix: [ bug #662 ] Bad aplication of Localtax2 for suppliers if country is Spain
 2013-01-08 13:38:38 -08:00
Laurent Destailleur
b7a5e226c9 Fix: Disable menu entry of a not avilable feature 2013-01-08 18:53:45 +01:00
Laurent Destailleur
53df0766cb Fix: Translation 2013-01-08 18:47:40 +01:00
Laurent Destailleur
334b5b5dac Fix: Minor fix 2013-01-08 18:31:55 +01:00
Laurent Destailleur
5aeec9eab2 Fix: line into theme 2013-01-08 16:46:06 +01:00
Marcos García
ae98ebc793 There is no need to warn the user as the picto already does 2013-01-08 12:14:11 +01:00
Laurent Destailleur
77f177d846 Fix: Bad selection of option 2013-01-08 11:04:29 +01:00
Laurent Destailleur
a555b47acd Merge branch '3.3' of https://github.com/Dolibarr/dolibarr.git into 3.3 2013-01-08 10:45:59 +01:00
Laurent Destailleur
47482202ac Fix: Missing picto 2013-01-08 10:28:22 +01:00
simnandez
596df78d39 Fix: [ bug #662 ] Bad aplication of Localtax2 for suppliers if country 
is Spain
 2013-01-08 08:46:48 +01:00
Laurent Destailleur
f96c1d83cb Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3 2013-01-07 23:22:20 +01:00
Laurent Destailleur
0889bdc3eb Fix: Error using static method 2013-01-07 23:20:00 +01:00
Laurent Destailleur
eca1e3a7e1 Look: Minor fix in themes 2013-01-07 17:57:39 +01:00
Laurent Destailleur
e5f5e38736 Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3 2013-01-07 00:41:32 +01:00
Laurent Destailleur
091e469050 Fix: [ bug #622 ] attaching wrong file when sending the invoice via 
e-mail
 2013-01-07 00:40:18 +01:00
eldy
24d3fdfe6c Fix: bad setup entry page 2013-01-06 21:52:59 +01:00
eldy
c0bbd5d730 Merge branch '3.3' of git://github.com/Dolibarr/dolibarr.git into 3.3 2013-01-06 20:46:58 +01:00
eldy
492d00ee86 Fix: Syntax error with pgsql 2013-01-06 20:45:03 +01:00
Laurent Destailleur
567cd00f5c Fix: Lost button 
Conflicts:
	htdocs/compta/facture.php
	htdocs/fourn/facture/fiche.php
 2013-01-06 13:33:09 +01:00
Laurent Destailleur
a40047d464 Merge pull request #578 from marcosgdf/translations 
Translations!
 2013-01-06 04:03:14 -08:00
Laurent Destailleur
d70f671ba0 Merge pull request #576 from simnandez/3.3 
Fix: [ bug #662 ] Bad aplication of Localtax2 for suppliers if country is Spain
 2013-01-06 04:02:12 -08:00
Marcos García
ad5d2c3459 Added missing translations, improved es_ES translations and translated untranslated text in modules admin page 2013-01-05 19:23:16 +01:00
Laurent Destailleur
d44b086527 Fix: font size 2013-01-05 16:32:58 +01:00
simnandez
c0246c07b1 Fix: [ bug #662 ] Bad aplication of Localtax2 for suppliers if country 
is Spain
 2013-01-05 16:03:00 +01:00
Laurent Destailleur
a9ff3c2be1 Merge pull request #574 from simnandez/3.3 
Fix: Modify Spanish localtax2 to new rate
 2013-01-05 03:29:54 -08:00
Laurent Destailleur
9ce7a430b8 Merge pull request #573 from marcosgdf/translations 
Added missing translations
 2013-01-05 03:18:33 -08:00
simnandez
c639d80372 Fix: [ bug #662 ] Bad aplication of Localtax2 for suppliers if country 
is Spain
 2013-01-05 09:47:54 +01:00
simnandez
32b19802b1 Fix: [ bug #662 ] Bad aplication of Localtax2 for suppliers if country 
is Spain
 2013-01-05 09:43:40 +01:00
simnandez
773882c8c0 Merge branch '3.3' of git://github.com/Dolibarr/dolibarr.git into 3.3 2013-01-05 09:42:20 +01:00
simnandez
d0265db3d2 Fix: Modify Spanish localtax2 to new rate 2013-01-05 09:07:01 +01:00
Marcos García
5bf93ca41a Added missing es_ES translation & fixed typo 2013-01-04 23:56:22 +01:00
Marcos García
d27519338a Added missing translations 
Reverted removal of strings in PR #570
Added missing strings to en_US
 2013-01-04 22:34:55 +01:00
Cedric GROSS
ff3231045b Fix: A better fix for escaping data: escape for database must be done 
during sql request forging. Also renamed tag to tag.

Merge:
Security fix emailing read and
unsubscribe

unsubscribe can lead to email disclosure

Conflicts:
	htdocs/public/emailing/mailing-unsubscribe.php
 2013-01-04 18:08:34 +01:00
simnandez
9a3681e6b0 Fix: Bug creating invoice from a contract 2013-01-04 16:23:15 +01:00
simnandez
b9ec558501 Trad: Add missing ca_ES and es_ES translations 2013-01-04 16:13:03 +01:00
simnandez
68866eaa5f Fix: Withdrawal payment warning 2013-01-04 11:07:31 +01:00
Laurent Destailleur
a9ce8083cb Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3 2013-01-04 00:24:39 +01:00
Laurent Destailleur
86645d8be9 Fix: Field birthday must be hidden for moral members 2013-01-04 00:23:46 +01:00
Laurent Destailleur
932c36e695 Merge pull request #568 from FHenry/3.3 
CheckStyle
 2013-01-03 11:47:57 -08:00
Regis Houssin
c730aff87b Fix: possibility to activate jquery plugins with a constant 2013-01-03 19:14:22 +01:00
fhenry
3e05581c70 Same as last commit 2013-01-03 15:13:07 +01:00
fhenry
f2a4e42712 CheckStyle 
I check everypalce where this function is call in Dolibarr, and to be
consistant it's better to use new attribute names
 2013-01-03 14:44:04 +01:00
Laurent Destailleur
b667400cc1 Fix: [ bug #618 ] External accounts can access confidential informations 
(a lot)
 2013-01-02 21:35:28 +01:00
Laurent Destailleur
96416735df Fix: [ bug #618 ] External accounts can access confidential informations 
(a lot)
 2013-01-02 18:43:59 +01:00
Laurent Destailleur
380d036d5c Fix: Bad test onto project list id 2013-01-02 15:12:46 +01:00
Laurent Destailleur
cd6e3464db Fix: Several fixes for bad management of external/internal users. 2013-01-02 14:35:16 +01:00
Laurent Destailleur
049a6dc742 Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3 2012-12-31 14:00:38 +01:00
Laurent Destailleur
dbdc4e6ce8 Fix: Normalize option names 2012-12-31 13:40:13 +01:00
Laurent Destailleur
f7a53eebfb Fix: Suggested start date of subscription must be validation date. 2012-12-31 13:39:42 +01:00
Marcos García
674034e648 Translated some strings in the code 2012-12-31 05:55:06 +01:00
Marcos García
d7121f6351 Updated demo trigger class with last changes in triggers 2012-12-31 05:30:09 +01:00
Marcos García
93c5acbf39 There's actually no CONTRACT_MODIFY trigger 2012-12-31 05:26:56 +01:00
Marcos García
50975b61b7 Revert "Fixed typo introduced in commit ca2b3f11b166f395e11af74d825989737920e925" 
This reverts commit a90db96421.
 2012-12-31 05:22:18 +01:00
Marcos García
adc9897d16 Agenda contacts type wasn't shown in $elementList 2012-12-31 05:10:35 +01:00
Marcos García
3b68faa119 Added missing translations 2012-12-31 05:10:18 +01:00
Marcos García
632b2d7a05 Fixed a bug when modifying a 0% local tax 2012-12-31 04:11:56 +01:00
Marcos García
406ce9e11c Update changelog + update deprecated triggers in database 2012-12-31 04:11:13 +01:00
Marcos García
a90db96421 Fixed typo introduced in commit ca2b3f11b1 2012-12-31 04:10:48 +01:00
Laurent Destailleur
f345e43dad Fix: date 2012-12-30 22:23:23 +01:00
Laurent Destailleur
815f43904d Fix: Warning if setup not complete 2012-12-30 21:56:53 +01:00
Laurent Destailleur
df43d477fc Merge pull request #562 from simnandez/3.3 
Fix: Supplier is mandatory into adding invoice suppliers
 2012-12-30 08:38:34 -08:00
Laurent Destailleur
86c9011437 Merge pull request #561 from marcosgdf/3.3 
Updated changelog + also removed unused triggers when migrating from 3.2.X
 2012-12-30 08:36:25 -08:00
Laurent Destailleur
753d79f181 Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3 2012-12-30 17:14:06 +01:00
Laurent Destailleur
0d09de0cf8 Fix: Normalize trigger names for fichinter module. 2012-12-30 17:13:43 +01:00
Regis Houssin
b838895db9 Fix: change for a neutral email 2012-12-30 15:13:49 +01:00
Laurent Destailleur
a1b0fbcc2c Fix: [ bug #659 ] Comment in recurrent invoices is not stored 
Fix: Missing payment mode
 2012-12-30 14:14:52 +01:00
Laurent Destailleur
201829e60c Fix:[ bug #653 ] Error while creating additional attributes 2012-12-30 13:49:37 +01:00
Laurent Destailleur
717657dd05 Fix: [ bug #654 ] Event rapport PDF showing ActionAC_OTH_AUTO 2012-12-30 12:40:32 +01:00
Marcos García
c3a75307b0 Merge branch '3.3' of git://github.com/Dolibarr/dolibarr into 3.3 2012-12-30 12:37:48 +01:00
Laurent Destailleur
ca2b3f11b1 Fix: Several fix in trigger names 2012-12-30 12:24:53 +01:00
Laurent Destailleur
3fb60304db Fix: Css for ecm module 2012-12-30 12:02:54 +01:00
simnandez
f05176dc8a Fix: Date is mandatory into adding customer orders 2012-12-30 10:49:11 +01:00
simnandez
9732a2f336 Fix: Supplier is mandatory into adding invoice suppliers 2012-12-30 10:26:18 +01:00
simnandez
f0f45b70da Fix: Supplier is mandatory into adding invoice suppliers 2012-12-30 10:24:20 +01:00
Laurent Destailleur
b8303bdd5f Fix: CSS 2012-12-29 23:40:16 +01:00
Marcos García
99bf09dc9e Updated changelog + also removed unused triggers when migrating from 3.2.x 2012-12-29 18:28:24 +01:00
Laurent Destailleur
703c82f9e2 Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3 2012-12-29 17:35:07 +01:00
Laurent Destailleur
5e05e0aa55 Fix: Trigger names 2012-12-29 17:34:52 +01:00
Laurent Destailleur
bc489773e8 Merge pull request #559 from FHenry/3.3 
Fix [ bug #658 ] Seacrh on bank do not work for description
 2012-12-29 08:32:47 -08:00
Laurent Destailleur
1667228d74 Fix: Normalize new trigger names. 2012-12-29 16:42:30 +01:00
Laurent Destailleur
caf4130fb7 Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3 2012-12-29 16:41:28 +01:00
Laurent Destailleur
44fe52d5b2 Fix: Missing field 2012-12-29 16:32:47 +01:00
Laurent Destailleur
35a9fbda59 Merge pull request #556 from marcosgdf/3.3 
Improved translations
 2012-12-29 07:29:29 -08:00
Laurent Destailleur
a84e06cbfc Merge pull request #555 from simnandez/3.3 
Trad: Update cashdesk ca_ES and es_ES to spanish rule RD1619/2012
 2012-12-29 07:28:55 -08:00
fhenry
32966fe25f Fix [ bug #658 ] Seacrh on bank do not work for description 2012-12-29 16:02:02 +01:00
Laurent Destailleur
ca6e9643ea Fix: Pb in json function for objects 2012-12-29 12:21:13 +01:00
Laurent Destailleur
7d60c33c1a Fix: typo 2012-12-29 12:16:45 +01:00
Laurent Destailleur
17a3204578 Fix: dol_json_encode was wrong with objects 2012-12-29 06:51:12 +01:00
Laurent Destailleur
215139ca72 Fix: Test for css must match test for js 2012-12-29 05:14:07 +01:00
Marcos García
bae8a749b8 Replaced 'Tel' string with 'Phone' to allow translation 2012-12-29 02:51:35 +01:00
Marcos García
4af2a4f875 Improved agenda translations 2012-12-29 02:21:00 +01:00
Laurent Destailleur
6ff9444903 Fix: temporary folder when creating ODT segments on Windows or system… 2012-12-29 01:25:56 +01:00
Marcos García
354c00b9ca CerfaFR donation template wasn't translating payment mode 2012-12-29 01:13:31 +01:00
Marcos García
316552f4ea Added missing translation and fixed references to incorrect variable 2012-12-29 00:59:16 +01:00
Marcos García
1b153aef93 Fixed donation payment mode translation and another problem with donation edit form 2012-12-29 00:46:25 +01:00
Marcos García
c8eac78a8d Translated labels that weren't being translated and improved es_ES translations 2012-12-29 00:24:55 +01:00
Marcos García
7ff5db3385 Improved and added missing es_ES translations 2012-12-29 00:21:50 +01:00
Laurent Destailleur
1722d58196 Fix: Selection of choice in demo page 2012-12-28 22:05:36 +01:00
Laurent Destailleur
2bec26c32a Fix: Some fix into menu translation 2012-12-28 19:18:04 +01:00
Laurent Destailleur
012ee020a4 Fix: Bad label 2012-12-28 15:48:20 +01:00
simnandez
87434fa9c8 Trad: Update cashdesk ca_ES and es_ES to spanish rule RD1619/2012 2012-12-28 11:41:53 +01:00
Laurent Destailleur
8436f0666d Fix: [ bug #252 ] Contrat : pas d'éditeur WYSIWYG 
Fix: Margins information must be visible for orders, proposals and
invoices only.
Fix: Delete button for contracts not visible
 2012-12-28 11:36:31 +01:00
Laurent Destailleur
a8012d0f18 Fix: [ bug #617 ] champs non repris lors d'une création de commande à 
partir d'une propale
 2012-12-27 18:02:36 +01:00
Laurent Destailleur
1a530d0ca9 Fix: Broken translation 2012-12-27 17:12:35 +01:00
Laurent Destailleur
ba4be70a5e Fix: External user was not using correct menu handler. 2012-12-27 17:06:55 +01:00
Laurent Destailleur
f566cd4d99 Fix: Use date of user to define if an action is in past or future. 2012-12-27 15:43:52 +01:00
Laurent Destailleur
251f4f3742 Fix: Avoid duplicate link 2012-12-27 15:33:18 +01:00
Laurent Destailleur
c7b3f2099e Fix: [ bug #648 ] Warning into instalation 
Install must use new log modules.
 2012-12-27 15:22:40 +01:00
Laurent Destailleur
f9700dc941 Fix: [ bug #651 ] FusionPDF created files cannot be deleted 2012-12-27 14:37:15 +01:00
Laurent Destailleur
fc71073e4e Fix: Minor fix into user interface 2012-12-27 14:25:52 +01:00
Laurent Destailleur
d4f81a9ee7 Fix: Predefined invoice feature was broken. 2012-12-27 12:51:38 +01:00
Laurent Destailleur
6ba4a22d21 Fix: Migration of payment id not complete 2012-12-27 01:22:00 +01:00
simnandez
a209d5cd55 Fix: Box issues 2012-12-26 12:01:34 +01:00
Laurent Destailleur
3aa9c75b0d Fix: If thirdparty module not enabled, company and contact fields must 
not be visibles
 2012-12-21 17:56:40 +01:00
Laurent Destailleur
fe469b83ab Fix: [ bug #641 ] Suppression d'un administrateur 2012-12-21 17:45:13 +01:00
Laurent Destailleur
ec767a9772 Correct path determination if origin is project 2012-12-21 15:39:21 +01:00
Laurent Destailleur
e102592fcd Merge pull request #551 from simnandez/develop 
Trad: Add missing credit note payments ca_ES and es_ES translations
 2012-12-21 06:35:47 -08:00
Laurent Destailleur
a3f679183f Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2012-12-21 14:26:26 +01:00
Laurent Destailleur
6716003960 Fix: delete 2012-12-21 14:23:48 +01:00
Laurent Destailleur
f1671e5acf Fix: Remove last chackstyle errors 2012-12-21 11:59:55 +01:00
simnandez
61ee604888 Trad: Add missing credit note payments ca_ES and es_ES translations 2012-12-21 09:27:51 +01:00
Laurent Destailleur
65b59b8d92 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-12-21 04:14:24 +01:00
Laurent Destailleur
8f2baf08ac Fix: Checkstyle 2012-12-21 04:14:02 +01:00
Laurent Destailleur
5dfefa1313 Fix: doxygen 2012-12-20 20:16:10 +01:00
Laurent Destailleur
6b43810881 Merge pull request #550 from simnandez/develop 
GUI: Amarok disabled buttons more accurated
 2012-12-20 10:35:59 -08:00
Laurent Destailleur
1d17d990bd Fix: Patch from antar3s: Re: Filter on company type in modSociete 2012-12-20 17:42:23 +01:00
simnandez
a10cdcc72e GUI: Amarok disabled buttons more accurated 2012-12-20 17:16:32 +01:00
Laurent Destailleur
bcd2fead3d Fix: patch from forum "User permissions on modAgenda" 2012-12-20 17:07:15 +01:00
Laurent Destailleur
e39ec132e5 Fix: Checkstyle 2012-12-19 20:59:08 +01:00
Laurent Destailleur
78a1354a52 Fix: Solve phpunit regression. 
Include an option to support local tax of type 7 (need more time to
validate this type).
 2012-12-19 18:51:49 +01:00
Laurent Destailleur
e9d7a4adc6 Fix: Removed warnings 2012-12-19 15:29:27 +01:00
Laurent Destailleur
11ab579639 Fix: Several fixes to avoid PDF lib conflicts. 2012-12-19 13:06:45 +01:00
Laurent Destailleur
d69e88435c Add option to have alternative method when ftp does not work 2012-12-18 23:45:51 +01:00
Laurent Destailleur
c0b3690a11 Fix: FTP login 2012-12-18 20:58:50 +01:00
Laurent Destailleur
dff532159d Fix: FTP modules fails with servers than need passive connection 2012-12-18 18:17:07 +01:00
Laurent Destailleur
6952a5f465 Fix: syntax error 2012-12-18 15:00:35 +01:00
Laurent Destailleur
19d5458ded Prepare freeze of 3.3 2012-12-18 14:21:56 +01:00
Laurent Destailleur
6b01c45210 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2012-12-18 13:14:29 +01:00
Laurent Destailleur
4cc44292e7 Fix: Maxi debug of holiday module 2012-12-18 13:12:11 +01:00
Regis Houssin
fb0869e0d0 Merge pull request #549 from jfefe/webservices 
New webservice method to create a thirdparty with contact and user
 2012-12-18 02:49:45 -08:00
jfefe
0d8969e2a6 New webservice method to create a thirdparty with contact and user 2012-12-18 11:17:46 +01:00
Laurent Destailleur
7cbd938c9c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-12-18 10:10:19 +01:00
Laurent Destailleur
e4b4f459da Fix: Missing drop of table deprecated into 3.2 2012-12-18 10:10:04 +01:00
simnandez
c70bba3a57 Fix: showrefnav fails with multicompany 2012-12-18 09:01:04 +01:00
Laurent Destailleur
752aabfc86 Fix: dynamic menu does not works with auguria. Add a temporary fix. 2012-12-17 23:19:48 +01:00
Laurent Destailleur
515f30591d Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2012-12-17 15:48:16 +01:00
Laurent Destailleur
7cf47b2e24 Fix: Missing translation 2012-12-17 15:47:01 +01:00
fhenry
2d2aaad1b0 Manage Extrafields deletion for contact 2012-12-16 23:18:20 +01:00
Laurent Destailleur
a83329f6c1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-12-16 19:46:33 +01:00
Laurent Destailleur
5cf07a214c Fix: Close db at wrong place 2012-12-16 19:42:58 +01:00
Laurent Destailleur
4ad38f91fa Merge pull request #544 from simnandez/develop 
Qual: Delete unused files of the amarok theme
 2012-12-16 10:28:03 -08:00
Regis Houssin
65090c582d Fix: checkstyle 2012-12-15 11:39:47 +01:00
Regis Houssin
bbbfc8c018 Merge pull request #545 from ricardosequeira/develop 
Develop
 2012-12-14 19:23:46 -08:00
simnandez
a528c7786c Qual: Delete unused files of the amarok theme 2012-12-14 23:21:42 +01:00
Laurent Destailleur
5a99076cf5 Fix: Clean amarok style. Removed hard coded length of close cells. 2012-12-14 18:35:50 +01:00
Laurent Destailleur
0c0653b3d8 Fix: Removed rubbish line 2012-12-14 18:34:24 +01:00
Laurent Destailleur
cfa52f7ff3 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2012-12-14 17:56:49 +01:00
Laurent Destailleur
c36d013971 Fix: Link missing 2012-12-14 17:55:42 +01:00
simnandez
e1a8368c28 GUI: Amarok buttons black label are most visible 2012-12-14 17:10:39 +01:00
simnandez
d934aa12a9 GUI: Amarok improved login screen 2012-12-14 17:05:56 +01:00
Laurent Destailleur
7b1ed60375 It is better to use external link instead of adding hard coded 
list.
 2012-12-14 14:39:22 +01:00
simnandez
c05ed2a146 GUI: Update amarok theme to work into 3.3 2012-12-14 13:01:57 +01:00
fhenry
0e1d83c698 Change sample data for createThirdParty 2012-12-13 19:58:36 +01:00
fhenry
d03d81a174 Merge remote-tracking branch 'origin/develop' into develop 2012-12-13 19:47:27 +01:00
fhenry
ff5f01646a Web Service Agenda/Actioncomm with extrafields 2012-12-13 19:11:03 +01:00
fhenry
605d236ecc WebService Agenda/Actioncomm 2012-12-13 19:09:40 +01:00
fhenry
0f07297329 variable spelling error 2012-12-13 17:33:53 +01:00
Regis Houssin
b09a44701e Fix: wrong EOL 2012-12-13 13:08:03 +01:00
fhenry
3fc51c2786 Commit without password 2012-12-13 12:50:52 +01:00
fhenry
14c1616adb Full standard extrafields management in Thirds Party Web service 2012-12-13 12:34:00 +01:00
Regis Houssin
5f41174cfa Fix: bad path for photo and uniformize code 2012-12-13 11:42:59 +01:00
Laurent Destailleur
57742b347a Fix: Bad position of field with non A4 pages 2012-12-12 20:58:49 +01:00
Laurent Destailleur
a11e4b5124 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-12-12 19:02:38 +01:00
Laurent Destailleur
c107697dc1 Fix: Var not always initialized 2012-12-12 18:14:21 +01:00
simnandez
8ac17c8206 Trad: Fix typo error into es_ES 2012-12-12 17:12:50 +01:00
simnandez
7cbcd1fc5d Fix: Withdrawal spanish generation adapted to new AEAB rule: profid1 is 
mandatory
 2012-12-12 17:00:29 +01:00
simnandez
488d482508 Fix: Withdrawal spanish generation adapted to new AEAB rule: profid1 is 
mandatory
 2012-12-12 16:57:53 +01:00
Laurent Destailleur
e2e86e16d0 Merge pull request #537 from grandoc/develop 
Develop
 2012-12-12 07:01:54 -08:00
Laurent Destailleur
13d5a2e12c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-12-12 14:46:33 +01:00
Laurent Destailleur
bdb112c820 Fix: Using bad root url. 2012-12-12 14:46:13 +01:00
Laurent Destailleur
411bdfda5f Merge pull request #538 from simnandez/develop 
Fix: Use transcountry instead trans for localtaxes label
 2012-12-12 05:41:56 -08:00
Laurent Destailleur
2c2465ffad Comment to make test 2012-12-12 13:14:28 +01:00
simnandez
614a8e48a2 Fix: Use transcountry instead trans for localtaxes label 2012-12-12 12:40:30 +01:00
Grand Philippe
993e484bdd prepare multi-user event 2012-12-12 12:17:56 +01:00
Laurent Destailleur
4413c0a5a7 Fix: upload user file 2012-12-12 11:57:56 +01:00
Laurent Destailleur
5d370c7e96 Fix: force redirect to https could not work for some environments 2012-12-12 02:37:15 +01:00
Laurent Destailleur
0128cc36c8 Fix: url example 2012-12-12 01:57:52 +01:00
Laurent Destailleur
caf897cfa7 Clean code to help debug pb with payment methods. 2012-12-12 01:49:23 +01:00
Laurent Destailleur
a972199296 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-12-12 00:51:15 +01:00
Laurent Destailleur
38b1c540ef Fix: Bad url forging 2012-12-12 00:49:32 +01:00
Grand Philippe
dc0558989b Merge remote-tracking branch 'origin/develop' into develop 2012-12-11 19:04:54 +01:00
Laurent Destailleur
7c19fc97b8 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2012-12-11 18:05:39 +01:00
Christophe Battarel
27670d62ba fix missing $conf global var in llxHeader() function 2012-12-11 15:14:43 +01:00
Laurent Destailleur
cee805f473 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2012-12-11 11:00:37 +01:00
Laurent Destailleur
080276a504 Fix: bad escape function. email missing 2012-12-11 10:59:03 +01:00
Laurent Destailleur
1c02dc4f9d Fix: better translation 2012-12-11 10:50:35 +01:00
Laurent Destailleur
f4459ee1f1 Fix: Regression detected by PHPUnit 2012-12-10 19:06:59 +01:00
Laurent Destailleur
43fe5766a1 New: Holiday need to support half day to be usefull. 2012-12-10 16:10:08 +01:00
Grand Philippe
a91a96e72e merge 2012-12-10 10:02:13 +01:00
Laurent Destailleur
8e764e88e6 Update TCPF 
Added japanese font files.
 2012-12-10 01:47:39 +01:00
Laurent Destailleur
ab5998d32f Fix: japanese language 2012-12-10 01:42:25 +01:00
Ricardo Sequeira
cf3831d4da Improved translation 2012-12-09 21:17:59 +00:00
Laurent Destailleur
21bd9bf749 Merge pull request #533 from FHenry/develop 
comment
 2012-12-09 11:56:54 -08:00
Laurent Destailleur
5931df82c6 Qual: Clean code to make choice of default value easier. 2012-12-09 20:54:45 +01:00
Laurent Destailleur
70be706347 New: Add greece regions and provinces 2012-12-09 20:01:16 +01:00
fhenry
adcb70eafa Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2012-12-09 19:13:47 +01:00
Laurent Destailleur
773e3decf6 Fix: typo 2012-12-09 18:50:10 +01:00
Laurent Destailleur
c44481fb91 Normalize key name 2012-12-09 18:47:23 +01:00
Laurent Destailleur
f4def0cd89 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-12-09 18:45:03 +01:00
Laurent Destailleur
03cacbcd1d Ignore external modules 2012-12-09 18:44:31 +01:00
Laurent Destailleur
f47422f551 Fix: Errors into turnover reports 2012-12-09 18:40:01 +01:00
Laurent Destailleur
77ca4241a5 New: Can input a payment back onto an credit note. 2012-12-09 18:39:42 +01:00
fhenry
ec09f79a2f comment 2012-12-08 19:23:13 +01:00
Regis Houssin
158f581f03 Merge pull request #532 from FHenry/develop 
prepare module for "Single login at one time"
 2012-12-08 10:09:29 -08:00
fhenry
0e76875e9c prepare single login at one time 2012-12-08 18:41:32 +01:00
Laurent Destailleur
8a5485c9b6 New: Skin can be personalized according to environment. 2012-12-08 18:38:14 +01:00
Laurent Destailleur
cd676b323d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-12-08 18:32:18 +01:00
fhenry
4570c57bfd Change-Id: I003fa45e6e932350b9d21b00ed4817b943470223 2012-12-08 18:28:19 +01:00
fhenry
131dc88139 prepare module for "Single login at one time" 2012-12-08 18:14:13 +01:00
Laurent Destailleur
c3e3595d9c Look: Uniformize style 2012-12-08 17:42:08 +01:00
Laurent Destailleur
3ec2ea0b25 Fix: More complete system info 2012-12-08 17:14:51 +01:00
fhenry
b3d21a4320 Fix [ bug #634 ] Install faild on PostGreSQL 
Fix  [ bug #631 ] Index Creation failed on fresh install with PostgreSQL
 2012-12-08 17:01:07 +01:00
fhenry
dbe00e9fbd Better bahaviour for pgSQL autoupdate trigger 2012-12-08 16:01:05 +01:00
Laurent Destailleur
58118bb366 Fix: error during include when multicompany module enabled. 2012-12-08 15:35:08 +01:00
Laurent Destailleur
ac3eb2e86c Fix: Use different css cache file for each user. This fix problem when 
using personalised constants that change style.
 2012-12-08 15:29:24 +01:00
Laurent Destailleur
afb45e1b31 Comment 2012-12-08 15:26:27 +01:00
Regis Houssin
bfd44da265 Merge pull request #529 from FHenry/develop_extrafielddeletion 
Extrafield remove and PgSQL field tms convertion
 2012-12-08 05:41:41 -08:00
Laurent Destailleur
6a60b78b28 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-12-08 14:25:36 +01:00
Laurent Destailleur
b119ab5539 Prepare 3.3 freeze. 2012-12-08 14:24:57 +01:00
fhenry
1d6bc23f4d - Uniformize Extrafield deletion for adherent,user,product,societe by 
using commonobject method
 - Add convertion of tms timestamp special case in mysql for pgsql
 2012-12-08 14:23:52 +01:00
Laurent Destailleur
db91526643 Fix: Solve conflict into migration/backup/restore (child tables 
must be after parent tables).
Fix: Migration of old version
 2012-12-08 14:16:39 +01:00
fhenry
574a950dc6 Add third party extrafield in web service exposure 2012-12-08 13:30:39 +01:00
fhenry
99f01f1dca [Task 632] : Add standard extra field feature for Agenda 2012-12-08 12:49:20 +01:00
Regis Houssin
9bc32b1b70 Merge pull request #524 from simnandez/develop 
Trad: Fix ca_ES and es_ES translations
 2012-12-08 01:47:25 -08:00
Regis Houssin
4e79a445c5 Merge pull request #522 from atm-maxime/develop 
Fix : minor html fix + changelog
 2012-12-08 01:46:59 -08:00
simnandez
5778683849 Trad: Fix ca_ES and es_ES translations 2012-12-07 17:13:09 +01:00
Regis Houssin
f984b669b2 Fix: Fix: Use another method to help avoid having a space in value in 
order to use this value with jquery
 2012-12-07 13:48:11 +01:00
Maxime Kohlhaas
4cffe3e5a3 Fix : minor html fix + changelog 2012-12-07 11:06:51 +01:00
Regis Houssin
be7d545297 Fix: wrong variable name 2012-12-07 10:50:16 +01:00
Regis Houssin
8ea3614a3c Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-12-07 10:48:10 +01:00
Regis Houssin
7ff3002993 Fix: Check if amount is numeric, for example, an error occured when 
amount value = o (letter) instead 0 (number)
 2012-12-07 10:47:36 +01:00
Laurent Destailleur
41302b7b75 Merge pull request #521 from grandoc/develop 
fix : typo
 2012-12-06 11:15:10 -08:00
Laurent Destailleur
3858085a7f Add option MAIN_HELPCENTER_LINKTOUSE to define target link "I need help" 
onto logon page.
 2012-12-06 17:59:37 +01:00
Grand Philippe
c6a3add952 fix : typo 2012-12-06 17:09:12 +01:00
Regis Houssin
50206bbd73 Fix: avoid errors 2012-12-06 10:43:27 +01:00
Laurent Destailleur
2cfd8fbd64 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-12-05 21:32:49 +01:00
Laurent Destailleur
7250592d0c Code comments 2012-12-05 21:32:18 +01:00
Christophe Battarel
bbc470b3ae add search box to find product by supplier ref 2012-12-05 19:56:23 +01:00
Christophe Battarel
88db3da002 allowing product search by supplier ref 2012-12-05 19:51:25 +01:00
Christophe Battarel
b68153ce9a add button in order to create intervention from services ordered 2012-12-05 19:07:07 +01:00
Christophe Battarel
0c064c777a add ability to fichinter to be created from an order (services only) 2012-12-05 19:01:18 +01:00
Christophe Battarel
2a4261db28 add linked object storage in fichinter 2012-12-05 18:48:02 +01:00
Laurent Destailleur
db2eb79f34 Merge pull request #517 from atm-maxime/develop 
Fix : on supplier bill validation, question about stock was asking for s...
 2012-12-05 07:14:05 -08:00
Maxime Kohlhaas
64f5d59ddf Fix : on supplier bill validation, question about stock was asking for stock decrease instead of increase 2012-12-05 15:42:59 +01:00
Regis Houssin
136f454111 Merge pull request #516 from atm-maxime/develop 
Trans : counter to 0 every month translations
 2012-12-05 06:02:18 -08:00
Maxime Kohlhaas
2824278414 Trans : counter to 0 every month translations 2012-12-05 14:56:29 +01:00
Maxime Kohlhaas
5992ebcdbc New : option to reset numbering to 0 every month using @99 in the mask 2013-02-06 11:52:49 +01:00
Laurent Destailleur
4a5062283d Merge pull request #515 from atm-maxime/develop 
New : option to reset numbering to 0 every month using @99 in the mask
 2012-12-05 04:19:16 -08:00
Regis Houssin
a4f0b7f0df Fix: avoid error with external modules 2012-12-05 11:36:10 +01:00
Regis Houssin
3d4621327c Fix: EOL !! tant que ce problème sera présent, les risques de problèmes 
de merge et de conflits sera présent !! il faut utiliser la dernière
version d'Eclipse et de Egit...
 2012-12-05 11:18:45 +01:00
Regis Houssin
644a05f6dc Merge pull request #457 from atm-maxime/mko559 
Task # 559 : price by quantity
 2012-12-05 00:15:27 -08:00
Maxime Kohlhaas
954a578ebd Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko559 
Conflicts:
	htdocs/install/mysql/migration/3.2.0-3.3.0.sql
 2012-12-05 09:10:55 +01:00
jfefe
9a8f81c740 Remove deprecated fields 
fix : data is an array, not an object
 2012-12-05 06:42:05 +01:00
jfefe
8ae10ef9f0 New webservice methods for contact : 
- new method to get contact info
- new method to create a contact
- new method to get a list of contact for a thirdparty
 2012-12-05 03:47:25 +01:00
jfefe
771634c66b Add contact info when get an user by webservice 2012-12-05 02:11:11 +01:00
Laurent Destailleur
bee97a6b3b Restore another lost commit. 
Fix: Restore compatibility with FPDF.

Conflicts:
	htdocs/core/lib/pdf.lib.php
 2012-12-05 00:47:20 +01:00
Laurent Destailleur
5d27fd61df Beautify instal pg. 
Fix: Debian package
Restore PHPUnit test (A PHP Unit test that fails should not be removed
but fixed and be kept in error until fix is published. Otherwise,
PHPUnit are useless).

Conflicts:
	htdocs/install/fileconf.php
	htdocs/install/inc.php
 2012-12-05 00:45:10 +01:00
Laurent Destailleur
e3d07621eb Fuck git. Restore another lost commit. 2012-12-04 20:51:45 +01:00
Laurent Destailleur
b0b0f06655 Fix: Removed useless code 2012-12-03 20:23:16 +01:00
Laurent Destailleur
9b9b8b4156 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-12-03 20:19:53 +01:00
Laurent Destailleur
bac4bf07a3 New: Add patch from pgrand to start link of several contacts onto an 
event
 2012-12-03 20:19:35 +01:00
Regis Houssin
a0bed6c47f Fix: For avoid conflicts with external modules 2012-12-03 17:29:08 +01:00
Regis Houssin
4388be7295 FIXME $ident is not defined 2012-12-03 17:16:04 +01:00
Regis Houssin
c0fba8262f FIXME pending correction of the "addline" method 2012-12-03 11:20:03 +01:00
Regis Houssin
9079c1fb3b Fix: phpunit error 2012-12-03 09:58:18 +01:00
Laurent Destailleur
7d8c0837b6 Restore another lost commit. 2012-12-02 19:45:35 +01:00
Laurent Destailleur
518b169a89 Increase field size (some system need to store an url here) 2012-12-02 19:41:49 +01:00
Laurent Destailleur
7b824665a5 Revert "Increase field size (some system need to store an url here)" 
This reverts commit 7ade37831e.
 2012-12-02 19:41:06 +01:00
Laurent Destailleur
7ade37831e Increase field size (some system need to store an url here) 2012-12-02 19:33:39 +01:00
Laurent Destailleur
86e08e87d5 Fix: date format 2012-12-02 18:21:26 +01:00
Laurent Destailleur
fd22705de4 New: Log handler can now manage indent on database transactions 2012-12-02 15:20:45 +01:00
Laurent Destailleur
d578d0be2b Perf: Log optimize. Saved 10KB of memory. 2012-12-02 14:33:24 +01:00
Laurent Destailleur
d428549e15 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-12-02 13:51:52 +01:00
Laurent Destailleur
938dc92ab6 Qual: More complete error management into delete methods 2012-12-02 13:51:33 +01:00
Laurent Destailleur
6fcc32b326 Comments 2012-12-02 12:59:06 +01:00
Regis Houssin
00aa22e1d7 Fix: wrong EOL 2012-12-02 11:03:23 +01:00
Christophe Battarel
c3aa626e18 function getTypeOfLocalTaxFromRate now receives thirdparty in parameter and returns array of localtax type and amount/rate. no more sql in pdf model. 2012-12-02 10:52:53 +01:00
Christophe Battarel
f0e75bf11a dont use ES translation for labels 2012-12-02 10:52:04 +01:00
Christophe Battarel
785491ca2c add function gettypeoflocaltax and modify pdf models 2012-12-02 10:51:18 +01:00
Christophe Battarel
8544003d7b remove unused arrays into pdf models (localtaxes) 
Conflicts:
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php

Change-Id: I633bfc4b0ec39f9121662d0f876f1edb36173e8e
 2012-12-02 10:49:29 +01:00
Christophe Battarel
093468420a show local taxes on crabe pdf model 2012-12-02 10:42:24 +01:00
Laurent Destailleur
09bb10b2a6 Restore lost commit 2012-12-01 15:50:39 +01:00
simnandez
3ab0b26d00 Trad: Update ca_ES and es_ES profid of countries 2012-12-01 15:47:52 +01:00
simnandez
c365dbc679 New: [ task #314 ] Can define if prof id are mandatory or not 2012-12-01 15:47:39 +01:00
simnandez
4f2f56fced New: [ task #314 ] Can define if prof id are mandatory or not 2012-12-01 15:47:33 +01:00
simnandez
d8651ca830 Trad: Add missing margins translations 2012-12-01 15:47:28 +01:00
simnandez
d14308e07d Trad: Add ca_ES and es_ES missing translations 2012-12-01 15:47:22 +01:00
simnandez
af304638c8 Fix: Add to areas not working if we navigate with shownavref 2012-12-01 15:47:16 +01:00
Laurent Destailleur
4136c27516 RESTORE CODE WITH ID D2adaf7. The Merge daacf79 as lost more than 50 
commits !
 2012-12-01 15:45:05 +01:00
Maxime Kohlhaas
69fa1e9d10 Fix : replace PRODUIT_PRICE_BY_QTY by PRODUIT_CUSTOMER_PRICES_BY_QTY 2012-12-01 14:38:59 +01:00
Maxime Kohlhaas
e45438994c Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko559 
Conflicts:
	htdocs/install/mysql/migration/3.2.0-3.3.0.sql
 2012-12-01 14:36:51 +01:00
Laurent Destailleur
bba1492621 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-12-01 12:23:12 +01:00
Laurent Destailleur
d30b74e69e Merge pull request #508 from simnandez/develop 
Fix: Add to areas not working if we navigate with shownavref
 2012-12-01 02:56:11 -08:00
Laurent Destailleur
daacf797c4 Merge pull request #500 from cbattarel/develop 
[Task #204] more local taxes manangement
 2012-12-01 02:49:45 -08:00
Laurent Destailleur
d2adaf7fdc Merge pull request #506 from FHenry/develop 
Add import_key attribute into contact class creation SQL request
 2012-12-01 02:49:24 -08:00
Laurent Destailleur
31b37c5aff Fix: Length not hard coded 2012-12-01 11:31:02 +01:00
simnandez
a2123d0fe9 Trad: Update ca_ES and es_ES profid of countries 2012-11-30 21:49:27 +01:00
simnandez
b4e16827dc New: [ task #314 ] Can define if prof id are mandatory or not 2012-11-30 21:23:12 +01:00
Laurent Destailleur
624c0fa040 Fix: Restore compatibility with FPDF. 2012-11-30 20:31:43 +01:00
Laurent Destailleur
9d17b8f96c Fix: Label not complete 2012-11-30 19:39:22 +01:00
simnandez
6487baa081 New: [ task #314 ] Can define if prof id are mandatory or not 2012-11-30 18:46:05 +01:00
simnandez
dda12c3d70 Trad: Add missing margins translations 2012-11-30 17:58:12 +01:00
simnandez
f0ba52445d Trad: Add ca_ES and es_ES missing translations 2012-11-30 17:36:48 +01:00
simnandez
dbf1a727be Fix: Add to areas not working if we navigate with shownavref 2012-11-30 16:20:01 +01:00
Laurent Destailleur
008f5fbcfc New: extrafields are available onto users cards. 2012-11-30 15:55:59 +01:00
Christophe Battarel
b70df3762c Merge branch 'develop' of https://github.com/cbattarel/dolibarr into develop 2012-11-30 10:58:57 +01:00
Christophe Battarel
04718b1832 resolve conflict 2012-11-30 10:57:42 +01:00
fhenry
f7b6f44767 oops, correct version 2012-11-30 04:51:11 +01:00
fhenry
1315e9a2ba Add import_key attribute into contact class creation SQL request 2012-11-30 04:40:06 +01:00
Regis Houssin
75fa37cde9 Fix: avoid warning in strict mode 2012-11-30 00:41:31 +01:00
Regis Houssin
c37ebea688 Fix: use $object->id instead $id for security 2012-11-30 00:35:38 +01:00
Regis Houssin
969b510a6a Fix: best method 2012-11-30 00:29:13 +01:00
Regis Houssin
5d1b5d5e0c Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-11-30 00:06:54 +01:00
Regis Houssin
31785c8868 Fix: uniformize code 2012-11-30 00:06:25 +01:00
Laurent Destailleur
2ccf9462e4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-11-29 23:12:31 +01:00
Laurent Destailleur
b12469c562 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/holiday/fiche.php
 2012-11-29 23:12:16 +01:00
Laurent Destailleur
b507c12b13 Merge pull request #503 from atm-maxime/mko608 
Qual : remove multi fetch
 2012-11-29 14:08:03 -08:00
Laurent Destailleur
49a6c661fd Merge pull request #505 from FHenry/develop 
Fix installation error Erreur SQL : DB_ERROR_SYNTAX - insert into
 2012-11-29 14:07:47 -08:00
Laurent Destailleur
d5de68b985 Merge pull request #504 from simnandez/develop 
Qual: Uniformize withdrawals tabs
 2012-11-29 14:05:13 -08:00
Laurent Destailleur
184cced303 New: Implement all call to allow to remove a tab by an external module 2012-11-29 23:02:02 +01:00
fhenry
a49bf61f33 Add AGENDA_USE_EVENT_TYPE configuration into Agande module configuration 2012-11-29 19:09:36 +01:00
Regis Houssin
3005a4f7cf Fix: use specific code for avoid conflict 2012-11-29 18:37:37 +01:00
Regis Houssin
ffbeb38747 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-11-29 18:31:00 +01:00
Regis Houssin
583dfb225c New: add possibility to force label of buttons and hide the second 
button for dialog info only
 2012-11-29 18:30:16 +01:00
fhenry
c3ced863c1 Fix installation error Erreur SQL : DB_ERROR_SYNTAX - insert into 
llx_c_actioncomm (id, code, type, libelle, module, active, position)
values ( 5, 'AC_RDV', 'system', 'Rendez-vous' ,NULL, ,1 1); - You have
an error in your SQL syntax; check the manual that corresponds to your
MySQL server version for the right syntax to use near '1 1)' at line 1
 2012-11-29 17:59:28 +01:00
Laurent Destailleur
17e0aedebb Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2012-11-29 13:20:53 +01:00
Laurent Destailleur
a62f2a7c8d New: Add vat rate for south africa. 2012-11-29 12:53:12 +01:00
Christophe Battarel
51d87f8f4a function getTypeOfLocalTaxFromRate now receives thirdparty in parameter and returns array of localtax type and amount/rate. no more sql in pdf model. 2012-11-29 11:36:59 +01:00
Regis Houssin
36ca334821 FIXME: this return create an error in jenkins 2012-11-29 10:43:05 +01:00
Regis Houssin
d97f1937f8 Fix: UPGRADE ECLIPSE AND EGIT WITH THE LAST VERSION PLEASE !!!! 2012-11-29 10:25:33 +01:00
Regis Houssin
88fcfa9533 Fix: uniformize code 2012-11-29 10:23:47 +01:00
Maxime Kohlhaas
e3d6b0dd9e Fix : remove print_r... 2012-11-29 09:52:20 +01:00
simnandez
f348fabf4d Qual: Uniformize withdrawals tabs 2012-11-29 09:34:10 +01:00
Laurent Destailleur
e62b3acef6 Fix: Translation 2012-11-29 01:59:31 +01:00
Laurent Destailleur
0b05d12e84 Fix: Bad picto 2012-11-29 01:27:24 +01:00
Laurent Destailleur
3d10689eca Qual: Maxi debug of withdrawal module. It is possible to understand how 
it works now !
 2012-11-29 01:18:57 +01:00
Maxime Kohlhaas
19f3866b05 Fix : have to fetch object after create to reload values + thirdparty must be loaded if mode = create 2012-11-29 01:05:45 +01:00
Maxime Kohlhaas
1fc35d7d42 Fix : value returned after order confirm was 0 if update OK, and order page wasn't reloaded 2012-11-29 00:38:39 +01:00
Maxime Kohlhaas
0587b06cf4 Fix : global error print + no use of & for affectation 2012-11-29 00:20:24 +01:00
Laurent Destailleur
60fc84a4d9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-11-29 00:07:21 +01:00