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

30000 Commits

Author SHA1 Message Date
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