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
Maxime Kohlhaas
332c077d77 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko559 2012-11-09 13:46:50 +01:00
Laurent Destailleur
661d37eacf Fix: New vat for switzerland 2012-11-08 12:15:15 +01:00
Regis Houssin
afe339a2e2 Fix: strict mode 2012-11-07 12:00:17 +01:00
Regis Houssin
40725e72a5 Fix: missing spanish localtax values update 2012-11-07 11:49:28 +01:00
Laurent Destailleur
579544aa2f Add example of comment 2012-11-07 02:22:25 +01:00
Maxime Kohlhaas
7035ec42f1 Task # 559 : Modifications to store unitprice as in supplier prices 2012-11-07 00:38:53 +01:00
Laurent Destailleur
831fe6a29e Fix: More fix about the new localtax system 2012-11-06 23:45:16 +01:00
Maxime Kohlhaas
5586897f70 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko559 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/install/mysql/migration/3.2.0-3.3.0.sql
 2012-11-06 23:07:40 +01:00
Laurent Destailleur
7d01ea7fc3 Fix: Do not break dolibarr usage if log fails 2012-11-06 19:42:03 +01:00
Laurent Destailleur
fff8598282 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-11-06 19:30:38 +01:00
Laurent Destailleur
f37c559235 Fix: regression 2012-11-06 19:23:23 +01:00
Laurent Destailleur
9c8d653780 Merge pull request #477 from FHenry/develop 
Fix bug on mass mailling unsubsscribe fonctionnality
 2012-11-06 09:52:32 -08:00
Regis Houssin
869c6e1fda Merge pull request #478 from jfefe/webservices 
Minor improvement of webservice for product
 2012-11-06 08:44:03 -08:00
jfefe
8a69a258fd image information in webservice product : fix wrong objet 2012-11-06 16:18:26 +01:00
fhenry
e12999bcfd Correct fix 2012-11-06 15:39:47 +01:00
fhenry
9a3c7a230b Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2012-11-06 15:36:44 +01:00
Laurent Destailleur
348674c438 Merge pull request #476 from simnandez/develop 
Fix: if no results do not charge data
 2012-11-06 06:26:50 -08:00
jfefe
8175a9a7e5 Add image information in webservice product 2012-11-06 15:16:49 +01:00
Regis Houssin
7de5a7fd3f Fix: compatibility with multicompany 2012-11-06 14:56:49 +01:00
fhenry
3651b8895e Fix bug on mass mailling unsubsscribe fonctionnality 2012-11-06 14:21:17 +01:00
simnandez
353c932e11 Fix: if no results do not charge data 2012-11-06 12:33:35 +01:00
jfefe
9eac0d06ec Add price_ttc value in product properties when call by webservice 2012-11-06 01:41:31 +01:00
Regis Houssin
8954422435 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-11-05 17:27:01 +01:00
Regis Houssin
72598bf4d4 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-11-05 17:25:57 +01:00
jfefe
8361cc29a1 Can have the thirdparty status 'active' when creating by webservices 2012-11-05 17:25:30 +01:00
Laurent Destailleur
ba56e679bd Fix: Calculation of default date for payment term was not using 
function.
 2012-11-05 17:21:05 +01:00
Laurent Destailleur
4cd1bbb0ca Fix: bad data init 2012-11-05 17:01:05 +01:00
Laurent Destailleur
027ad065a5 Removed TODO 2012-11-05 12:04:13 +01:00
jfefe
00ee6e9960 Can have the thirdparty status 'active' when creating by webservices 2012-11-05 03:49:17 +01:00
Laurent Destailleur
5d57677814 Fix: example 2012-11-04 21:20:27 +01:00
Laurent Destailleur
8896803921 New: We can use a dynamic value ($conf->global->XXX for example) into 
titles of menus.
New: Can choose menu entry to show with external site module.
 2012-11-04 21:19:12 +01:00
Laurent Destailleur
542b6f0731 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-11-04 19:32:30 +01:00
Laurent Destailleur
bebead8e54 Fix: To fix database integrity problems (I didn't find how 
orphelins appears, but they appears on some plateform).
 2012-11-04 19:32:14 +01:00
fhenry
1f41547dc2 Set unique key index unique in db (Conform to SQL standard) and needed 
for migration to other SGBD with key.sql file
 2012-11-04 15:55:12 +01:00
fhenry
be79c06c72 Set unique key index unique in db (Conform to SQL standard) and 
needed for migration to other SGBD
 2012-11-04 15:21:08 +01:00
Laurent Destailleur
80c252dd62 Fix: Use same labels to go back to draft than other elements. 
Re-open is for "closed" to a validated status.
Modify is for a validated status to draft.
 2012-11-03 21:33:55 +01:00
Laurent Destailleur
454b8b7279 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-11-03 21:14:38 +01:00
Laurent Destailleur
7e1a74cef1 Fix: If shipment is closed before delivery element is generated, there 
was no way to generate it again (dead lock situation).
 2012-11-03 21:14:23 +01:00
Regis Houssin
1722db223a Fix: add timepicker default options 2012-11-03 20:41:59 +01:00
Regis Houssin
77e45f70a4 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-11-03 19:16:02 +01:00
Regis Houssin
d0dc336a85 New: jQuery and jQuery UI upgrade 
New: jQuery Timepicker addon for Datepicker
 2012-11-03 19:15:45 +01:00
Laurent Destailleur
4c60740623 Do not loose input when there is a validation error. 2012-11-03 17:34:57 +01:00
Laurent Destailleur
e25fe89887 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-11-03 17:00:20 +01:00
Regis Houssin
076fa17593 Fix: missing colspan value 2012-11-03 16:58:50 +01:00
Laurent Destailleur
aae39ecb2e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-11-03 16:58:23 +01:00
Laurent Destailleur
0f2dac163f Fix: Bad label when validating/paying an invoice from POS module 2012-11-03 16:58:07 +01:00
Regis Houssin
a26ab0e8e1 Fix: add just colspan value 2012-11-03 16:51:41 +01:00
Laurent Destailleur
078b015db8 Work on multitax (vat). Need your test. 
Qual: Because params were often missing in calculate_price(), params are
now mandatory.
 2012-11-03 16:32:49 +01:00
Laurent Destailleur
135a622076 Fix: Bad parameter 2012-11-03 15:35:11 +01:00
Laurent Destailleur
af0c1a5f76 Fix: Missing parameter 2012-11-03 15:33:49 +01:00
Laurent Destailleur
7f2c6dc6eb Only code comments 2012-11-03 14:44:06 +01:00
Laurent Destailleur
19c617e4a0 Fix: Solve double ";;" 2012-11-03 13:49:31 +01:00
Laurent Destailleur
0c7af5c8a0 Fix: Not enought space for free text. To avoid to edit again and again 
value for all templates, I added an option to be able to fix template
onto production when space is not enough.
 2012-11-03 13:32:37 +01:00
Laurent Destailleur
f571adf62e Fix: For supplier invoice, we must use properties of supplier to know if 
seller use localtax RE and IRPF.
 2012-11-03 12:19:47 +01:00
Laurent Destailleur
df7bedf955 Fix: [ bug #592 ] stock sold value is wrong 2012-11-03 12:12:24 +01:00
Laurent Destailleur
d3491e9ac0 Fix: Colors must be set into CSS. 2012-11-03 11:55:39 +01:00
Laurent Destailleur
7fd16c3a7e Qual: Error management 2012-11-03 11:54:32 +01:00
Laurent Destailleur
dac97e2115 Fix: Do not try to show supplie ref if not defined. 2012-11-03 11:39:48 +01:00
Laurent Destailleur
118733c600 Fix: Error message type 2012-11-03 11:26:45 +01:00
Laurent Destailleur
375f464553 Fix: Option FACTURE_DEPOSITS_ARE_JUST_PAYMENTS was not used into 
journals.
 2012-11-03 04:29:38 +01:00
Laurent Destailleur
79e3b4d792 Fix: Missing br 2012-11-03 04:02:48 +01:00
Laurent Destailleur
4d098efa38 Fix: [ bug #580 ] problème saisie du code bic/swift des coordonénes 
bancaires client
 2012-11-03 03:34:49 +01:00
Laurent Destailleur
8709933288 Fix: Too much sanitizing 2012-11-03 00:47:09 +01:00
Laurent Destailleur
f8a9733b73 Again 2 pixels missings 2012-11-03 00:37:10 +01:00
Laurent Destailleur
ce12f6980d Ypdate language files for zh_TW 2012-11-02 15:46:12 +01:00
Laurent Destailleur
5f3ceb0081 Fix: Label for payment by cheque using the wrong translation key 
Fix: Option to overwrite translation did not work as expected
Fix: Bad translation for greece
 2012-11-02 15:41:09 +01:00
Laurent Destailleur
f87865f039 Fix: crazy pagebreak when warterwark is higher than free space. 2012-11-02 14:21:32 +01:00
Wind Chen
b083c3b692 Added new language zh_TW 
1.Added zh_TW directory into /htdoc/langs/
2.Added Language_zh_TW= Traditional Chinese into
/htdoc/langs/en_US/languages.lang
 2012-11-01 23:08:24 +08:00
Regis Houssin
a108abddda Fix: disabled ajax for the moment 2012-11-01 10:48:48 +01:00
Laurent Destailleur
0328f0de11 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-10-31 19:38:28 +01:00
Laurent Destailleur
9b1f70e58e Fix: Trick to solve easily problem of font for some foreign users. 2012-10-31 19:38:16 +01:00
Regis Houssin
455d399bce Fix: remove tag 2012-10-31 16:15:37 +01:00
Regis Houssin
bacc8991b3 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-10-31 15:51:22 +01:00
Regis Houssin
634b5f7d1b Fix: image is hard defined 2012-10-31 15:50:14 +01:00
Laurent Destailleur
fd7aea9779 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-10-31 15:21:38 +01:00
Laurent Destailleur
18e5f8dea6 Fix: Bad detection of space left 2012-10-31 15:21:21 +01:00
Laurent Destailleur
b619437377 Merge pull request #469 from camlafit/develop 
Return Human readable date product
 2012-10-31 07:13:46 -07:00
Laurent Destailleur
13ef8491b7 Fix: Error management 2012-10-31 15:09:42 +01:00
Laurent Destailleur
68bf51c8dd Qual: Uniformize PDF code 2012-10-31 14:55:35 +01:00
cam.lafit
a3f0ce9063 Merge all substitutions on same loop (Invoicing with odt) 
* It's not necessary to have a redondant loop to substitute all variables
 2012-10-31 14:49:27 +01:00
cam.lafit
7b8b015569 Return Human readable date product 
* By default date with mktime format, not great on Invoice
 2012-10-31 14:49:27 +01:00
Laurent Destailleur
f6d9b2abe3 New: Add hidden option MAIN_PDF_MARGIN_LEFT, MAIN_PDF_MARGIN_RIGHT, 
MAIN_PDF_MARGIN_TOP, MAIN_PDF_MARGIN_BOTTOM to force margins of
generated PDF.
Qual: Use 2 different var for reserver footer height and free text
height.
 2012-10-31 13:48:59 +01:00
Laurent Destailleur
dbfe71922e Fix: Avoid warnings 2012-10-31 12:35:52 +01:00
Regis Houssin
b70af837df Fix: avoid warning 2012-10-31 09:59:24 +01:00
Regis Houssin
2607a8a3dd Merge pull request #470 from atm-maxime/develop 
Fix : internal contact not displayed in rouget PDF
 2012-10-31 01:51:36 -07:00
Regis Houssin
0e0bbbeddc Fix: morning strict mode 2012-10-31 09:50:20 +01:00
Maxime Kohlhaas
240d310a7f Fix : shipment PDF rouget wasn't using the right var to access related internal contact 2012-10-31 08:57:56 +01:00
Maxime Kohlhaas
69111e423f Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko559 2012-10-31 08:40:13 +01:00
Laurent Destailleur
64d8d558a5 Qual: Uniformize pdf code 2012-10-31 02:29:45 +01:00
Laurent Destailleur
066bcbb469 Qual: Add dol_format_address PHPUnit tests 2012-10-31 01:45:48 +01:00
Laurent Destailleur
8ea48b28eb New: More complete setup for bank ids according to countries 2012-10-31 00:46:46 +01:00
Laurent Destailleur
1d7820c5ac New: English bank account need a bank code (called sort code) to 
identify an account.
 2012-10-31 00:22:13 +01:00
Laurent Destailleur
42d2a0a2d1 Fix: Bad position of columns. Works with all paper format now. 2012-10-30 19:24:31 +01:00
Laurent Destailleur
08724f5ec0 Qual: Some changes to use more efficiently bottom of page when there is 
several pages (we don't keep space for total on all pages, but only last
one)
 2012-10-30 18:26:04 +01:00
Laurent Destailleur
54852e29e7 Qual: Removed duplicate template (nearly no difference between sirroco 
and typhon, so no need to keep them both).
 2012-10-30 17:59:16 +01:00
Laurent Destailleur
ea90571925 Fix: The bottom margin is already included into heightforfooter 
This provide 1cm more for product description.
 2012-10-30 17:57:32 +01:00
Laurent Destailleur
6f9c9fcd55 Fix: Free text overlap data when not on last page. 2012-10-30 13:11:17 +01:00
Laurent Destailleur
df6c29ba0b Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2012-10-30 13:00:22 +01:00
Laurent Destailleur
9bee735c2d Fix: Bad code for specimen 2012-10-30 12:02:13 +01:00
Laurent Destailleur
9d44590980 Fix: Using a more precise function to calculate free texts height avoid 
having few pixels offset on free texts.
 2012-10-30 11:17:49 +01:00
Laurent Destailleur
6bfe3e3905 Fix: Translation 2012-10-30 09:43:31 +01:00
Maxime Kohlhaas
fa46923b3e Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko559 2012-10-30 08:06:29 +01:00
Laurent Destailleur
1bbdfc3717 Fix: DTD used for HTML output pages is HTML, not XML. 2012-10-29 19:32:10 +01:00
Laurent Destailleur
e013fa01a7 Fix: Revert direction of option (this information is a legal issue for 
most countries). Also, i removed the mandatory test, this is required
for invoices, not proposals.
So now, there is no need to hide by default because test on invoice
setup has been removed, so we can show by default (if defined) and use
option to force to hide if we want.
 2012-10-29 11:38:32 +01:00
Regis Houssin
44f591e600 Fix: can't delete an export 2012-10-29 10:36:26 +01:00
Regis Houssin
705b0c0d52 Fix: better for show signature 2012-10-29 10:00:24 +01:00
Laurent Destailleur
9d4471dd67 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/core/modules/import/import_csv.modules.php
 2012-10-28 19:53:14 +01:00
Laurent Destailleur
3738d3e6be Fix: Better fix for import when field is computed by a function 2012-10-28 18:57:30 +01:00
Regis Houssin
b952a7f9bf Fix: convert line delimiters (use the last eclipse version) 2012-10-28 13:57:21 +01:00
Regis Houssin
82cb0802d0 Fix: broken feature, missing $page 
Fix: bad field name
 2012-10-28 02:14:08 +02:00
Laurent Destailleur
a6bd506bd0 Fix: syntax error 2012-10-27 20:32:33 +02:00
Laurent Destailleur
ee29c65708 Move stock import into stock module (stock module is at a low level than 
product)
 2012-10-27 20:27:07 +02:00
Laurent Destailleur
6c0fb9a1f1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-10-27 20:04:03 +02:00
Laurent Destailleur
a7e35a9308 Fix: If we exclude dirs, we must also clean array to avoid to count 
them.
 2012-10-27 20:02:09 +02:00
Maxime Kohlhaas
bed17951b1 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko559 2012-10-27 15:59:40 +02:00
Christophe Battarel
253e3412db fix wrong insert sql construction 
field type detection was made before optional conversions so it might be wrong; i replaced it with a more simple solution
 2012-10-27 12:55:28 +02:00
Regis Houssin
6b07579620 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-10-27 11:30:36 +02:00
Regis Houssin
2bbfad2460 Fix: missing parameter 2012-10-27 11:30:08 +02:00
Christophe Battarel
eb4cf359ec fix error in constant name for SOCIETE_CODEFOURNISSEUR_ADDON in get_codefournisseur() 2012-10-27 11:12:41 +02:00
Laurent Destailleur
443f5ca03e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-10-27 00:23:54 +02:00
Laurent Destailleur
7a48351909 Fix: delete file from ecm module 2012-10-27 00:23:16 +02:00
Laurent Destailleur
833ada4732 Merge pull request #465 from simnandez/develop 
Fix: [ bug #579 ] Multi-Company and imports
 2012-10-26 11:00:52 -07:00
simnandez
9ada60afbc New: More import options. Products categories 2012-10-26 18:53:56 +02:00
simnandez
3821bf8c66 New: More import options. Products categories 2012-10-26 18:43:34 +02:00
simnandez
9a05bc8e83 New: More import options. Products categories 2012-10-26 18:38:34 +02:00
simnandez
d4df585e3c New: More import options. Customer and suppliers categories 2012-10-26 18:34:49 +02:00
simnandez
425ebae802 New: More import options. Products categories 2012-10-26 18:19:04 +02:00
Laurent Destailleur
0d48682eed Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2012-10-26 17:59:39 +02:00
simnandez
7aec227694 New: More import options. Products stocks 2012-10-26 17:52:53 +02:00
simnandez
970933ec7f Fix: [ bug #579 ] Multi-Company and imports 2012-10-26 17:29:41 +02:00
Regis Houssin
93c03756ab Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-10-26 15:21:36 +02:00
Regis Houssin
c521a77e92 New: add key generator in webservices admin page 2012-10-26 15:20:47 +02:00
Regis Houssin
00dbf867ff Merge pull request #464 from simnandez/develop 
Trad: Add ca_ES and es_ES missing translations
 2012-10-26 00:28:44 -07:00
simnandez
4a0336759e Trad: Add ca_ES and es_ES missing translations 2012-10-26 09:21:08 +02:00
Regis Houssin
bc2280e4ab Fix: avoid phpunit warning 2012-10-26 09:12:19 +02:00
Maxime Kohlhaas
fd5fb90649 Task # 559 : price defined on product page is unit price. Need to multiplicate this price by qty to have the right global price in the product list 2012-10-26 01:07:11 +02:00
Maxime Kohlhaas
fc7bc7e5d9 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko559 2012-10-26 01:00:22 +02:00
Maxime Kohlhaas
0f1617c31d Task 559 : add use of price by qty in product selection (select and ajax search) 2012-10-26 01:00:03 +02:00
Laurent Destailleur
aee92ad3dc Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-10-26 00:59:11 +02:00
Laurent Destailleur
7eae998868 Fix: Bad default value 2012-10-26 00:57:51 +02:00
Regis Houssin
b5d70ad17f Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-10-25 22:30:41 +02:00
Regis Houssin
48ce43d6f1 New: add export filters (thank you Charles Benke) 2012-10-25 22:30:17 +02:00
simnandez
e89a06bb9c Fix: Bad ProfId assignation in imports 2012-10-25 17:08:25 +02:00
Laurent Destailleur
cbff238cbd New: Support property "required" for extra fields. 2012-10-25 16:23:58 +02:00
Christophe Battarel
2272d13f5a fix minor bug in invoice creation from another object 2012-10-25 15:50:43 +02:00
Christophe Battarel
135342b085 fix minor bugs in order creation from another object 2012-10-25 15:47:35 +02:00
Regis Houssin
4f1ef1bcf8 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-10-25 15:01:26 +02:00
Regis Houssin
89b794dcd0 Fix: avoid errors with IE 2012-10-25 15:01:04 +02:00
Laurent Destailleur
a60516ae0d Fix: Show warning only if transaction level not correct 2012-10-25 14:16:06 +02:00
Laurent Destailleur
7b92f66fab Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop
 2012-10-25 13:17:35 +02:00
Laurent Destailleur
daeb1029a1 New: Support field required or not 2012-10-25 13:11:55 +02:00
Laurent Destailleur
d142dec69a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-10-25 12:45:01 +02:00
Regis Houssin
53b9a95742 Merge pull request #461 from cbattarel/develop 
fix wrong test for product type in order->getNbProductsLines()
 2012-10-25 02:49:17 -07:00
Regis Houssin
9d95e8bffb Fix: missing hookmanager 2012-10-25 11:44:04 +02:00
Christophe Battarel
144b08cac1 fix wrong test for product type in order->getNbProductsLines() 
also add getNbServicesLines() function in order class.
 2012-10-25 11:26:36 +02:00
Laurent Destailleur
2953ef37e6 Methods works with most tables/elements 2012-10-25 10:06:29 +02:00
Regis Houssin
f8f1d3a0df Fix: borken feature, add PROPALE_PDF_PAIEMENT_ENABLED for view paiement 
mode and paiement method in pdf
 2012-10-25 09:24:05 +02:00
Regis Houssin
1cbd2a1b1c Fix: broken feature 2012-10-25 08:45:35 +02:00
Maxime Kohlhaas
84df6bd639 Task # 559 : forgot to update supplier prices sql table 2012-10-25 08:19:16 +02:00
Maxime Kohlhaas
03cf96ed31 Task # 559 : add discount by qty as done in supplier prices 2012-10-25 08:18:59 +02:00
Maxime Kohlhaas
6ffa8532c5 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko559 2012-10-25 07:56:30 +02:00
Regis Houssin
23707e2346 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-10-24 22:50:44 +02:00
Regis Houssin
65594d88a0 Fix: strict mode 2012-10-24 22:50:19 +02:00
Laurent Destailleur
773b082b13 Fix: Restore private: The public method to use by external code is 
addExtraField.
 2012-10-24 21:28:24 +02:00
Laurent Destailleur
1b116c05ef Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-10-24 21:21:58 +02:00
Laurent Destailleur
d1a4a6a090 New: Support synchro of field job/title. 
New: Add script to synchronize users from ldap to dolibarr.
 2012-10-24 21:19:10 +02:00
Laurent Destailleur
afb94c5014 Fix: Avoid warning 2012-10-24 21:16:58 +02:00
Regis Houssin
abb5047979 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-10-24 18:41:51 +02:00
Regis Houssin
5c78b2d5dd Fix: possibility to use this function in external module class 2012-10-24 18:41:22 +02:00
Laurent Destailleur
c88d8f5d0e Fix: Resotre synchro ldap 2 dolibarr 2012-10-24 17:35:28 +02:00
Laurent Destailleur
f701c1afba Fix translations 2012-10-24 17:33:47 +02:00
Laurent Destailleur
ec10bf4112 New: Add test for synchro ldap 2 dolibarr 2012-10-24 17:33:32 +02:00
Laurent Destailleur
0d92fe2de1 Normalize code 2012-10-24 17:32:10 +02:00
Laurent Destailleur
9c7b9f744f Removed deprecated field 2012-10-24 17:31:02 +02:00
Laurent Destailleur
4fd79a4675 Qual: Removed deprecated field 2012-10-24 17:30:23 +02:00
Maxime Kohlhaas
fdc6ed90a4 Task # 559 : forgot to update product_price table to add column 2012-10-24 17:22:45 +02:00
Maxime Kohlhaas
21875a5e4a Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko559 2012-10-24 17:18:42 +02:00
Maxime Kohlhaas
2ff77bb2f1 Task # 559 : no need for a max quantity 2012-10-24 17:18:11 +02:00
Maxime Kohlhaas
35773d08ff Task # 559 : mysql table creation + index and constraints 2012-10-24 17:16:03 +02:00
Laurent Destailleur
0b32b24eba Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-10-24 16:25:22 +02:00
Laurent Destailleur
2f4f427d9e Fix: ldap errors 2012-10-24 16:25:09 +02:00
Regis Houssin
1c84dbaeec Fix: missing zipcode in url 2012-10-24 12:27:43 +02:00
Regis Houssin
def1617f01 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-10-24 12:19:05 +02:00
Regis Houssin
382f1a54c3 Fix: add key generator in agenda xcal admin page 2012-10-24 12:18:40 +02:00
fhenry
597ba3e6fc [ task #581 ] Implement function DDLInfoTable for PostgreSQL db class 2012-10-24 11:37:00 +02:00
Regis Houssin
87d44c845d Fix: restrict the search in the beginning 2012-10-24 11:18:15 +02:00
Regis Houssin
1055cf4e53 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-10-24 10:19:46 +02:00
Regis Houssin
4f45ba8ff6 Fix: remove br 2012-10-24 09:56:31 +02:00
Laurent Destailleur
ed456347ce Merge pull request #458 from cbattarel/develop 
add charges and unitcharges in price update statement
 2012-10-23 17:17:35 -07:00
Laurent Destailleur
1999452701 Fix: Avoid warnings 2012-10-23 23:49:16 +02:00
Christophe Battarel
41541e4bc2 add charges and unitcharges in update statement 2012-10-23 10:54:35 +02:00
Regis Houssin
30430953de Fix: missing row and col parameters 2012-10-23 09:33:07 +02:00
Laurent Destailleur
a10518a2e3 Comment 2012-10-22 21:25:14 +02:00
Laurent Destailleur
9589b84a1a Fix: No reason to start content of a cell with br 2012-10-22 19:30:49 +02:00
Maxime Kohlhaas
c4b12d7371 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko559 2012-10-22 17:47:41 +02:00
Maxime Kohlhaas
8ba55f49f1 Task # 559 : start of price by quantity management 2012-10-22 17:47:15 +02:00
Maxime Kohlhaas
94c12cfb2e Task # 559 : start of price by quantity management 2012-10-22 17:24:14 +02:00
Regis Houssin
9bbea4f385 Fix: use span is better 2012-10-22 17:06:27 +02:00
Laurent Destailleur
eaad5f075e Fix: Some fix to removed refused controls by distrib package build 
systems.
 2012-10-22 13:08:55 +02:00
Laurent Destailleur
58eb02274f Fix: We must not use strtolower. Case sensitive search or not must be 
managed by the LIKE or LIKE BINARY into request (this make code
portable on other database with the database driver and this avoid
errors of strtolower when using non latin characters).
 2012-10-22 12:13:24 +02:00
Regis Houssin
2f15857dab Fix: add mobile phone in contact list 
TODO: Fax is obsolete and not used by several companies
 2012-10-22 11:20:59 +02:00
Regis Houssin
a240343482 Fix: add possibility to filter with zipcode (very important) 2012-10-22 11:05:55 +02:00
Regis Houssin
f89e3238ee New: try to use hooks for customizing lists 2012-10-22 10:49:16 +02:00
Regis Houssin
864f038370 Fix: missing "visible" field 2012-10-22 09:24:27 +02:00
Regis Houssin
6329344df2 Fix: broken features 
Fix: use entity O for all entities
 2012-10-22 09:15:08 +02:00
Laurent Destailleur
caa37422dd Fix: curl must ignore ssl validation 2012-10-22 01:26:03 +02:00
Laurent Destailleur
99607073e3 Fix: Some fixes for the autosubscription to mailing-lists 2012-10-22 01:16:29 +02:00
Laurent Destailleur
71ac3d4359 Migrate to new syslog system. 2012-10-22 01:01:10 +02:00
Laurent Destailleur
d56791d4dc Fix: Works with PHP 5.2 2012-10-22 00:43:59 +02:00
Laurent Destailleur
31779cdbd1 Fix: Bad date format 2012-10-22 00:28:32 +02:00
Laurent Destailleur
732b3ceace Fix: Bad error management when validating member 2012-10-22 00:18:32 +02:00
Laurent Destailleur
bba5057d5d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-10-21 15:51:03 +02:00
Laurent Destailleur
fbb3ce63a7 Fix: PDF works with US executive format. 2012-10-21 15:50:53 +02:00
Regis Houssin
97245d36aa Fix: wrong method 2012-10-20 11:10:36 +02:00
Regis Houssin
033e9066fb New: try to use hookmanager for customizing list 2012-10-20 10:08:18 +02:00
Regis Houssin
ac9dea1c19 Fix: security 2012-10-20 09:40:50 +02:00
Regis Houssin
99fa385602 Fix: minor vulnerabilities 2012-10-20 09:33:39 +02:00
Laurent Destailleur
cb95621d7e Merge pull request #455 from simnandez/develop 
New: More import options. Thirds Bank Accounts
 2012-10-19 10:27:41 -07:00
Laurent Destailleur
5a3be48d09 New: Can edit bookmark from list 2012-10-19 17:28:18 +02:00
Laurent Destailleur
ffa1b10061 doxygen 2012-10-19 14:45:00 +02:00
Laurent Destailleur
40a1ba3b96 Fix: Removed deprecated translation 2012-10-19 14:23:21 +02:00
Laurent Destailleur
4a10874f54 New: add waring message when date is too low. 2012-10-19 13:01:29 +02:00
simnandez
aa53b7a2ba New: More import options. Thirds Bank Accounts 2012-10-19 13:00:53 +02:00
Laurent Destailleur
70cf195fb4 Fix: removed test code 2012-10-19 09:34:31 +02:00
Laurent Destailleur
657d0197b6 Fix: json is a fuck... sh... 3 hours to find a bug ! (json fails 
without any warning when converting non utf8 strings).
 2012-10-18 16:30:12 +02:00
Laurent Destailleur
0152e226c1 Fix: Use correct translation of fields 2012-10-18 13:25:32 +02:00
Laurent Destailleur
82e0462dc8 Merge pull request #453 from simnandez/develop 
New: More import options. Categories Trad: Add es_ES and ca_ES missing translations
 2012-10-18 03:31:55 -07:00
Regis Houssin
d705995a49 Fix: convert line delimiters 2012-10-18 10:36:53 +02:00
Regis Houssin
446a81b4c4 Fix: move class in template 2012-10-18 10:35:55 +02:00
Laurent Destailleur
4afdf2f2d2 Fix: [ bug #554 ] Firstname and lastname should not be mandatory for 
corporate members.
 2012-10-17 20:55:13 +02:00
Laurent Destailleur
97001951e6 New: Add field stock into product export 2012-10-17 20:32:57 +02:00
Laurent Destailleur
a41186b4c5 [ bug #70 ] Champ Stock toujours vide dans export produit 2012-10-17 20:30:17 +02:00
Laurent Destailleur
33540cb2e8 Repair not synchronized denormalized field. 2012-10-17 20:22:50 +02:00
Laurent Destailleur
319b512157 Fix: Avoid empty messages 2012-10-17 19:02:21 +02:00
simnandez
d7dcd3c14b New: More import options. Supplier Products 2012-10-17 19:02:12 +02:00
Laurent Destailleur
c4ce66d784 Enhance error management 2012-10-17 18:47:18 +02:00
Laurent Destailleur
0cfd336c03 better message 2012-10-17 17:53:25 +02:00
Laurent Destailleur
ef1e735ff9 Fix: doxygen 2012-10-17 17:19:28 +02:00
Laurent Destailleur
4c5d696bb7 Translations 2012-10-17 16:13:06 +02:00
Laurent Destailleur
6803c68ebf Fix: Bad date format 2012-10-17 15:53:45 +02:00
Laurent Destailleur
796b0fc12c New: Enhance guide for new users to say how to start setup. 2012-10-17 15:19:43 +02:00
Laurent Destailleur
8ac375145d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-10-17 15:07:33 +02:00
Laurent Destailleur
4d5a6c6f01 Typo error 2012-10-17 15:07:13 +02:00
Laurent Destailleur
773b2ead35 Merge pull request #454 from cbattarel/develop 
correct bug in price delete
 2012-10-17 06:01:26 -07:00
Laurent Destailleur
bbedddf992 Fix: Removed warning 2012-10-17 14:53:05 +02:00
Laurent Destailleur
01bd20147e Fix: Some fixes and enhancement into modularizing log functions 2012-10-17 14:46:20 +02:00
Christophe Battarel
8f08d7a166 add entity in the unique key for delete 2012-10-17 14:25:43 +02:00
Laurent Destailleur
b160b97cbe New: Add warning message. 2012-10-17 14:23:56 +02:00
Laurent Destailleur
5e510d4312 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-10-17 14:15:27 +02:00
Laurent Destailleur
c56e3b5c90 Fix: Migration error 2012-10-17 14:15:11 +02:00
Laurent Destailleur
4a913cfb38 Merge pull request #449 from marcosgdf/odt-discounts 
Created function to retrieve total discounted amount of a commonobject
 2012-10-17 05:03:55 -07:00
Laurent Destailleur
05ca191335 Merge pull request #451 from marcosgdf/syslog 
Created a modular syslog handler system
 2012-10-17 05:03:14 -07:00
Laurent Destailleur
0dffe08c07 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-10-17 13:12:02 +02:00
Christophe Battarel
e8b92cc2c5 correct bug in price delete 2012-10-17 12:47:40 +02:00
Laurent Destailleur
0a97ce71e5 Add gg flag 2012-10-17 12:40:10 +02:00
simnandez
23d3b6a783 New: More import options. Supplier Products 2012-10-17 12:36:30 +02:00
simnandez
6f430cc630 New: More import options. Supplier Products 2012-10-17 11:43:26 +02:00
simnandez
cf814dc7fd New: More import options. Categories 
Trad: Add es_ES and ca_ES missing translations
 2012-10-17 10:42:16 +02:00
simnandez
2cf88e7847 New: More import options. Categories 
Trad: Add es_ES and ca_ES missing translations
 2012-10-17 10:40:17 +02:00
Laurent Destailleur
099bf034af Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2012-10-16 19:51:12 +02:00
Laurent Destailleur
4854c72348 Fix: [ bug #565 ] Display error bills have suppliers. 2012-10-16 19:15:36 +02:00
Laurent Destailleur
7bf5663096 Fix: [ bug #552 ] l'option "Adhérents non à jour" ne fonctionne pas 2012-10-16 18:33:49 +02:00
Regis Houssin
15aa2497ab Fix: compatibility with multicompany sharings 2012-10-16 17:59:00 +02:00
Regis Houssin
26a5ac53d7 Fix: possibility to disable ajax 2012-10-16 16:10:23 +02:00
Marcos García
3c051abc22 Orders and proposals should also replace {object_total_discount} 2012-10-16 13:43:50 +02:00
Marcos García
ac4ee01723 mod_syslog_syslog class shouldn't be active if openlog is not available 2012-10-16 13:39:23 +02:00
Marcos García
df2262f8be Stopped using (un)serialize functions but json functions 2012-10-16 12:18:05 +02:00
Marcos García
180eddff49 Because the rest of the class is using SYSLOG_CHROMEPHP_INCLUDEPATH it needs to be restored... 2012-10-16 02:25:48 +02:00
Marcos García
f250bb41e9 Removed unnecessary comments and commented unused config variables 2012-10-16 02:13:38 +02:00
Marcos García
07dcb07fd2 Created a modular syslog handler system 
I've split all log handlers into classes so that people can make
new log handler systems without making changes to the core.
Also, now every log handler can handle how and what will be logged.
 2012-10-16 02:01:37 +02:00
Marcos García
da94ec8fa4 Normalized thirdparties module card name 2012-10-16 01:36:42 +02:00
Laurent Destailleur
5dff8dbc6d New: Avoid horizontal scroll on standard resolution. 2012-10-15 23:13:28 +02:00
Laurent Destailleur
e34cdb76e8 Fix: Translation 2012-10-15 23:02:52 +02:00
Laurent Destailleur
df3c1ca644 Fix: Showing rate 2012-10-15 22:13:39 +02:00
Laurent Destailleur
7a7e2b6873 Fix: Error management 2012-10-15 21:42:17 +02:00
Laurent Destailleur
0dbc7ebb25 Fix: error management 2012-10-15 21:31:46 +02:00
Laurent Destailleur
354e673d92 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-10-15 20:54:11 +02:00
Laurent Destailleur
6f93e9cdac Fix: Can delete even if data corrupted (fk_bank set but entry removed 
manually into llx_bank).
 2012-10-15 20:53:49 +02:00
Marcos García
c9944a6b9b Created function to retrieve total discounted amount of a commonobject 
Also added an ODT tag to let people add it to their invoices, etc..
 2012-10-15 00:49:39 +02:00
Marcos García
59e8964bc5 Fixed PHP warning on MailmanSPIP module 
Also simplified the code and removed unused variables from it
 2012-10-14 23:56:28 +02:00
Laurent Destailleur
70ae16f89e Merge pull request #447 from simnandez/develop 
New: More import options. Warehouses
 2012-10-14 14:43:35 -07:00
Laurent Destailleur
118ec8277b Fix: Old data store 2012-10-14 13:27:18 +02:00
Laurent Destailleur
325d47c882 Fix: Creation of notes was not using DolEditor class. 2012-10-14 13:18:52 +02:00
simnandez
6f799f8e16 New: More import options. Warehouses 2012-10-13 18:02:43 +02:00
Laurent Destailleur
153997432f Fix: Several fix. 
New: Also allow to enter a payment with a negative value on an invoice
and positive onto other.
 2012-10-13 17:00:38 +02:00
Laurent Destailleur
8ff506b120 Sec: Sanitize all params page, sortfield and sortorder 2012-10-13 14:47:46 +02:00
Laurent Destailleur
ac38954c17 Fix: Regression selectlang choice 
Fix: Regression conf file was not saved successfully.
 2012-10-13 13:56:37 +02:00
Laurent Destailleur
2a8095f3de Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-10-13 13:03:57 +02:00
Laurent Destailleur
7385ea15db Doxygen 2012-10-13 13:03:39 +02:00
Regis Houssin
df1e4a401a Fix: convert line delimiters 
Info: the last Eclipse version fix this problem
 2012-10-13 11:42:58 +02:00
Regis Houssin
a12d453d38 Fix: security 2012-10-13 11:41:17 +02:00
Regis Houssin
67f40fcd1e Fix: works on security 2012-10-13 10:39:16 +02:00
Laurent Destailleur
091966902e Fix: for special_code=3 2012-10-12 22:18:31 +02:00
Laurent Destailleur
6046feda11 Restore border into PDF 2012-10-11 09:42:47 +02:00
Laurent Destailleur
6a7a982688 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-10-10 15:07:41 +02:00
Laurent Destailleur
4aebaf22ae Fix: Avoid wrap on amount 2012-10-10 15:06:02 +02:00
Regis Houssin
10bd942328 Fix: customer ref is very important for a best traceability 2012-10-10 12:04:08 +02:00
Regis Houssin
62f170d3d7 Fix: add escape 2012-10-09 20:23:02 +02:00
Regis Houssin
edb6195cc2 Fix: add similitude test 2012-10-09 20:08:54 +02:00
Regis Houssin
925af263fc Fix: best test 2012-10-09 18:54:21 +02:00
Regis Houssin
3abb1b88ff Fix: best method 2012-10-09 18:33:02 +02:00
Regis Houssin
6791d23032 Fix: use asterisk for define the percentage 2012-10-09 18:21:12 +02:00
Regis Houssin
a20f7094ef Fix: refactore 2012-10-09 18:11:51 +02:00
Regis Houssin
74dd4ce218 Fix: possibility to force the clause 2012-10-09 18:06:59 +02:00
Regis Houssin
337cb0faa5 Fix: add not exact method 2012-10-09 17:47:58 +02:00
Regis Houssin
9f43d8613c Fix: missing clean parameters 2012-10-09 16:59:19 +02:00
Regis Houssin
8486f9d85d Fix: missing spaces 2012-10-09 16:33:28 +02:00
Regis Houssin
7cde9ab668 New: add search method with case sensibility and filters 2012-10-09 15:49:42 +02:00
Laurent Destailleur
8b4886073c Fix: Removed the FIXME. This is supported by the pgsql driver. 2012-10-09 12:03:39 +02:00
Laurent Destailleur
4413613d14 Another better fix. 2012-10-09 11:56:39 +02:00
Laurent Destailleur
1725561c34 Better security fix: Using GETPOST does not fix all cases, also the real 
bug (missing escaping information when using it) was not fixed.
 2012-10-09 11:42:38 +02:00
Regis Houssin
72a1194d14 Fix: search with case sensitive method 
FIXME: Mysql "LIKE" is case insensitive by default and use LIKE BINARY
for case sensitive, Pgsql "LIKE" is case sensitive by default, and use
ILIKE for case insensitive
 2012-10-09 10:57:15 +02:00
Regis Houssin
a814ea7924 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-10-09 09:34:57 +02:00
Regis Houssin
4cd702bb1a Fix: prevent XSS and SQL injection 2012-10-09 09:34:12 +02:00
Regis Houssin
044ec61aba Merge pull request #446 from atm-maxime/develop 
Task # 186 : Forgot to add the new box in the mod definition...
 2012-10-08 23:50:49 -07:00
Regis Houssin
bfee8553f0 Merge pull request #445 from atm-maxime/mko543 
Bug # 543 and # 570 : contact address is now used in recipient block and...
 2012-10-08 23:50:29 -07:00
Regis Houssin
d61a8ee947 Fix: missing comma 2012-10-09 08:47:11 +02:00
Regis Houssin
089603e1c5 Fix: add import_key field 2012-10-09 08:40:32 +02:00
Maxime Kohlhaas
67dbae4486 Correction for new box inclusion 2012-10-09 00:58:07 +02:00
Maxime Kohlhaas
229005b1a9 Task # 186 : Forgot to add the new box in the mod definition... 2012-10-09 00:54:02 +02:00
Maxime Kohlhaas
d343b76f91 Bug # 543 and # 570 : contact address is now used in recipient block and no more display bug on customer order ref until 36 digits 2012-10-09 00:28:52 +02:00
Regis Houssin
478449da37 Fix: convert line delimiters 2012-10-08 20:47:10 +02:00
Regis Houssin
93d760e0fc Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-10-08 20:44:28 +02:00
Regis Houssin
7f7676d357 Fix: uniformize variable name 2012-10-08 20:44:12 +02:00
Laurent Destailleur
d51db70768 Missing translation 2012-10-08 20:25:03 +02:00
Laurent Destailleur
26f4b344cb Merge pull request #444 from cbattarel/develop 
fix wrong update in previous commit
 2012-10-08 10:55:33 -07:00
Regis Houssin
c35a1ebaf7 Fix: missing drop foreign key 2012-10-08 19:38:09 +02:00
Regis Houssin
0975918cc6 Fix: [task #146] Remove table llx_categorie_association 
Conflicts:
	htdocs/install/mysql/migration/3.2.0-3.3.0.sql
 2012-10-08 19:27:02 +02:00
Christophe Battarel
99b323e8d0 fix wrong update in previous commit 
(it was always remaining on step 5 !)
 2012-10-08 16:25:50 +02:00
Regis Houssin
67c41721f5 Merge pull request #443 from marcosgdf/translations 
Minor changes to es_ES translations
 2012-10-08 03:01:57 -07:00
Regis Houssin
88785a8fef Merge pull request #442 from cbattarel/develop 
fix wrong last update in cleansep function
 2012-10-08 03:01:34 -07:00
Marcos García
fed3c20548 Minor changes to es_ES translations 2012-10-08 11:44:55 +02:00
Christophe Battarel
04be578863 fix wrong last update in cleansep function 2012-10-08 11:32:28 +02:00
Marcos García
734b292440 Merge branch 'develop' into bug-569 
Conflicts:
	htdocs/install/inc.php
 2012-10-08 11:16:33 +02:00
Marcos García
8ed706e4ac Fixed bug #569 - Notices & Warnings when installing Dolibarr 
Also translated a string & variable and improved html use
 2012-10-08 02:45:58 +02:00
Laurent Destailleur
68ecc5eb89 Upgrade doliwamp 2012-10-08 02:38:30 +02:00
Laurent Destailleur
f9ceb78f58 Beautify instal pg. 
Fix: Debian package
 2012-10-07 20:04:07 +02:00
Laurent Destailleur
566855d7e8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	ChangeLog
 2012-10-06 23:15:10 +02:00
Laurent Destailleur
215d7a883e Fix: Revert bugged new feature that show false information. 2012-10-06 23:13:46 +02:00
Laurent Destailleur
430b63f4e1 Fix: Bad message 2012-10-06 22:54:23 +02:00
Laurent Destailleur
4789b5e2d1 Fix: Usage of specific mysql function is forbidden 2012-10-06 22:46:54 +02:00
Laurent Destailleur
053b4dd63c New: [ task #210 ] Can choose cash account during POS login 2012-10-06 21:47:59 +02:00
Laurent Destailleur
b2ec0a7669 Merge pull request #438 from simnandez/develop 
Trad: Add ca_ES and es_ES translations
 2012-10-06 11:16:23 -07:00
Laurent Destailleur
a659e6f9f7 More elegant position of button to aufofill fields. 2012-10-06 19:25:25 +02:00
simnandez
7faa90e831 New: More import options. Prepare database 2012-10-06 09:52:33 +02:00
simnandez
2d4957d415 Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop 2012-10-06 09:38:09 +02:00
Laurent Destailleur
6873e93b7f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-10-05 19:40:09 +02:00
Laurent Destailleur
34f2402cb5 Qual: Removed dead code 2012-10-05 19:39:53 +02:00
simnandez
0e5cc34b1f Trad: Add ca_ES and es_ES translations 2012-10-05 18:50:30 +02:00
Regis Houssin
b1ad840055 Fix: optimize code 2012-10-05 15:12:17 +02:00
Regis Houssin
6b21ca442d New: add possibility to defined position/job of a user 
Conflicts:
	htdocs/install/mysql/migration/3.2.0-3.3.0.sql
 2012-10-05 12:40:19 +02:00
Maxime Kohlhaas
85c03faec7 Merge branch 'mko186' into develop 
Conflicts:
	htdocs/langs/en_US/orders.lang
	htdocs/langs/fr_FR/orders.lang
 2012-10-05 08:30:09 +02:00
Regis Houssin
1b7f93fc29 Merge pull request #436 from simnandez/develop 
Task # 104: Check if module invoice is active and user has creation permissions. Move creation invoice to action bar into customer card
 2012-10-04 10:06:22 -07:00
Regis Houssin
6b50219999 Fix: add function for build $mysoc object 2012-10-04 18:54:56 +02:00
simnandez
f873198442 Fix: Warning into perms page 2012-10-04 18:40:05 +02:00
simnandez
caef97dc08 Task # 104: Check if module invoice is active and user has creation 
permissions. Move creation invoice to action bar into customer card
 2012-10-04 18:23:21 +02:00
Maxime Kohlhaas
16f82216bf Task # 186 : Add stock column in sql request to get object lines + display alert icon if stock is too low 2012-10-04 16:26:33 +02:00
Maxime Kohlhaas
5a64e3b1ec Task # 104 : Commited these 2 files instead of translations files 2012-10-04 15:43:52 +02:00
Laurent Destailleur
5c6b0c064e Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2012-10-04 15:43:28 +02:00
Laurent Destailleur
9ba100a84b New: Support removing tab into member module 2012-10-04 15:37:10 +02:00
Maxime Kohlhaas
0e17c7c063 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko186 2012-10-04 15:36:47 +02:00
Maxime Kohlhaas
87d643d482 Task # 104 : translations 2012-10-04 15:36:38 +02:00
Maxime Kohlhaas
12128a6226 Task # 186 : Stock calculation on product, migration + update product 2012-10-04 15:25:34 +02:00
Laurent Destailleur
bdb7becbc6 Fix: Try another fix on getTrad bug. 2012-10-04 09:44:04 +02:00
Laurent Destailleur
4b27a9215b Fix: Show message only when needed 2012-10-03 23:15:57 +02:00
Laurent Destailleur
59a33db53d Fix: Add warning to ask refresh. 2012-10-03 20:10:29 +02:00
Laurent Destailleur
1f2b05fbc0 Fix: Can unset ChromePHP output 2012-10-03 18:40:24 +02:00
Laurent Destailleur
fa016baa7e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-10-03 17:48:09 +02:00
Laurent Destailleur
2159848490 Fix: getTradFromKey 2012-10-03 17:47:53 +02:00
Laurent Destailleur
315670273d Merge pull request #434 from grandoc/develop 
try to fix canvas issue
 2012-10-03 06:16:35 -07:00
Laurent Destailleur
a821d6cafe Fix: We use dolibarr_details as type of DolEditor here, because we 
must not accept images as description is included into PDF and not
accepted by TCPDF.
 2012-10-03 14:52:01 +02:00
Laurent Destailleur
1d9e77a53d Fix: We use dolibarr_details as type of DolEditor here, because we must 
not accept images as description is included into PDF and not accepted
by TCPDF.
 2012-10-03 14:49:51 +02:00
Laurent Destailleur
0f78ffda5c New: POS module can works with only one payment method (cach, chq, 
credit card).
 2012-10-03 14:45:58 +02:00
Grand Philippe
fb487ff855 try to fix canvas issue 2012-10-03 14:20:04 +02:00
Laurent Destailleur
61958f445d Fix translation 2012-10-03 14:15:07 +02:00
Laurent Destailleur
3bd20ee8ba Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-10-03 13:04:29 +02:00
Laurent Destailleur
6d8ea8dcd5 Update trans 2012-10-03 13:04:18 +02:00
Regis Houssin
4ed05b5b2e Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-10-03 12:41:02 +02:00
Regis Houssin
935bb09b99 Fix: better translation 2012-10-03 12:39:48 +02:00
Laurent Destailleur
9997d6ca15 Fix: Other minor fixes 2012-10-03 11:53:14 +02:00
Laurent Destailleur
9dac672ca6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-10-03 11:43:51 +02:00
Laurent Destailleur
2617fc21a6 Some fix: List of invoices to show in "to bill" menu must contains 
"Validated, Shipment in process, Delivered" (some users may want to
make invoice before shipment, some after).
We keep workflow opened by default. Module workflow may restrict this
however.
Also, remove menu entry, because we now have direct link to page onto
list.
 2012-10-03 11:43:39 +02:00
Regis Houssin
18015986b6 Fix: bad field name 2012-10-03 11:38:18 +02:00
simnandez
921795e562 Task # 104 : Remove MAIN_FEATURES_LEVEL 2012-10-03 09:16:27 +02:00
Regis Houssin
fc1cc95d08 Fix: bad path 2012-10-03 08:54:21 +02:00
Laurent Destailleur
44ee8b8e38 Doxygen 2012-10-03 00:39:34 +02:00
Laurent Destailleur
c25e908b75 Doxygen 2012-10-03 00:30:50 +02:00
Laurent Destailleur
4243f94f80 Merge pull request #424 from aspangaro/develop 
Add function to choose chart of accounts
 2012-10-02 14:10:50 -07:00
Laurent Destailleur
883e51566f Merge pull request #432 from grandoc/develop 
try to fix canvas within members module
 2012-10-02 14:10:10 -07:00
Grand Philippe
ec9946222d new try to fix canvas within members module 2012-10-02 22:58:49 +02:00
Laurent Destailleur
82eacec792 Merge pull request #431 from atm-maxime/mko104 
Task # 104 : Can create an invoice from several orders
 2012-10-02 11:38:35 -07:00
Laurent Destailleur
bef9fd152b Fix: table creation scripts 2012-10-02 19:42:44 +02:00
Grand Philippe
085923dc64 try to fix canvas within members module 2012-10-02 18:27:41 +02:00
Maxime Kohlhaas
89e14043a1 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko186 2012-10-02 11:01:21 +02:00
Maxime Kohlhaas
3ca55eb058 Task # 104 : display invoice multi order link on third party page only if there are orders to bill + translations 2012-10-02 10:52:08 +02:00
Spangaro Alexandre
3ae6117e16 Reintegrate accounting.php in admin 2012-10-02 06:07:57 +02:00
Spangaro Alexandre
5c56bd629b Fix: add country in request 2012-10-02 05:45:50 +02:00
Spangaro Alexandre
8a99eedc6c Hum... Now it's work ! Little fix 2012-10-02 05:45:50 +02:00
Spangaro Alexandre
3e4fd761a5 Add function to choose chart of accounts 2012-10-02 05:45:49 +02:00
Laurent Destailleur
079ea61582 Fix: W3C 2012-10-02 00:36:23 +02:00
Laurent Destailleur
082ee53dae Fix: Miscellaneous fix in supplier product input 2012-10-02 00:30:23 +02:00
Laurent Destailleur
eec2a7b34e Merge pull request #429 from atm-maxime/mko559 
Task # 559 : add discount on supplier prices
 2012-10-01 13:31:17 -07:00
Laurent Destailleur
6971cf5779 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-10-01 22:05:22 +02:00
Laurent Destailleur
32fdfbb1cb Fix: Styles 2012-10-01 21:53:22 +02:00
Laurent Destailleur
43dce1c3fa Merge pull request #426 from grandoc/develop 
add canvas to adherents module
 2012-10-01 12:39:09 -07:00
Maxime Kohlhaas
1aa3156958 Task # 186 : new box of products with stock alert 2012-10-01 16:44:38 +02:00
Maxime Kohlhaas
af179eca94 Cosmetic : span buttons were'nt with the same style as links 2012-10-01 15:44:40 +02:00
Maxime Kohlhaas
8a62af1c78 Task # 559 : added use of discount in supplier bills 2012-10-01 11:49:20 +02:00
Maxime Kohlhaas
ed2a140046 Task # 559 : add display of discount in product list while adding line on supplier order 2012-10-01 11:45:28 +02:00
Maxime Kohlhaas
f62772a1c5 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2012-10-01 11:26:42 +02:00
Maxime Kohlhaas
1d21f24fa7 Task # 559 : Add possibility to define a discount for min quantity on supplier product prices 2012-10-01 11:25:17 +02:00
Maxime Kohlhaas
6329c01d5d Added link to multi-origin invoicing on thirdparty page 2012-10-01 11:23:51 +02:00
Regis Houssin
8c17266ed4 Merge pull request #425 from marcosgdf/translations 
Added missing & improved es_ES translations
 2012-10-01 01:11:30 -07:00
Regis Houssin
7837356fe9 Merge pull request #423 from simnandez/develop 
Trad: Add missing translations
 2012-10-01 01:11:14 -07:00
Grand Philippe
0215ce9122 add canvas to adherents module 2012-10-01 10:05:03 +02:00
Marcos García
a4b0f7e521 Fixed es_ES typo 2012-10-01 04:17:17 +02:00
Marcos García
13cbf154e1 Added missing & improved es_ES translations 2012-10-01 03:09:37 +02:00
Regis Houssin
bcf46d00f0 Fix: convert line delimiters !! 2012-09-30 21:26:58 +02:00
Regis Houssin
d23188c64a Fix: doxygen 2012-09-30 20:49:13 +02:00
Regis Houssin
422f028ac9 Fix: use ADHERENT_BANK_USE for check or not bank via invoice 
Fix: code optimizing
 2012-09-29 12:07:07 +02:00
Laurent Destailleur
9db72fb50d Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2012-09-28 16:11:46 +02:00
Laurent Destailleur
e7203fa4f3 New: The discount on line for supplier invoices is now supported 2012-09-28 16:08:44 +02:00
simnandez
6bbcb376b1 Trad: Add missing translations 2012-09-28 15:55:50 +02:00
Maxime Kohlhaas
6ac83a4205 Task # 355 : last correction 2012-09-28 14:58:47 +02:00
Maxime Kohlhaas
4deae1d948 Task # 355 : corrections + added on edit mode 2012-09-28 14:56:47 +02:00
Maxime Kohlhaas
398023e722 Task # 335 : translation 2012-09-28 14:29:20 +02:00
Maxime Kohlhaas
c0f22ac472 Task # 355 : autofill contat address with third party address 2012-09-28 14:27:16 +02:00
Regis Houssin
3b4090852c Merge pull request #420 from simnandez/develop 
Trad: Add missing translation
 2012-09-28 02:50:48 -07:00
Regis Houssin
0441c6dd46 Merge pull request #417 from aspangaro/develop 
Continue working on accountancy
 2012-09-28 02:43:54 -07:00
simnandez
67e38df6ee Trad: Add missing translation 2012-09-28 11:39:23 +02:00
Christophe Battarel
9f15a11b10 update lang files for import (csv options) 2012-09-28 10:28:17 +02:00
Christophe Battarel
15d7266abf import : add csv options (separator and enclosure) 2012-09-28 10:23:04 +02:00
Laurent Destailleur
d397be12ef Fix: Redirect on config home. 2012-09-27 23:57:10 +02:00
Laurent Destailleur
6c769cfaf3 Fix: postgresql compatibility 
Qual: Removed deprecated code
 2012-09-27 23:54:47 +02:00
Laurent Destailleur
49e79a2c28 Fix: database compatibility 2012-09-27 23:43:58 +02:00
Laurent Destailleur
e94ddde91d Fix: Patch calculation field odt 2012-09-27 21:08:32 +02:00
Laurent Destailleur
3a98f6903e Fix: If a customer has 2000 invoices, creating next one make 2000 
requests instead of 1.
 2012-09-27 20:54:04 +02:00
Laurent Destailleur
a98de7ef02 Fix: No error when hour not provided 2012-09-27 13:25:31 +02:00
Laurent Destailleur
9d732b0876 Fix: nowrap 2012-09-27 12:53:17 +02:00
Regis Houssin
1919604089 Fix: more compatible with multicompany transverse mode 
Fix: strict mode bubbles
 2012-09-27 11:57:46 +02:00
Laurent Destailleur
ad0e3ba4a0 Fix: Better translation 2012-09-27 10:48:40 +02:00
Laurent Destailleur
05a97aaaf0 Fix: Bad alignement when no menus 2012-09-27 01:38:31 +02:00
Laurent Destailleur
051b93c73b Qual: Code cleaner using field name instead of index number. 
New: Can use new syntax to define parent of a menu
(fk_mainmenu=&fk_leftmenu=)
 2012-09-27 00:05:13 +02:00
Spangaro Alexandre
e4391207e4 Add new dictionnary to edit accountingsystem 2012-09-26 20:37:28 +02:00
Spangaro Alexandre
7cea254255 Continue working on accountancy 2012-09-26 20:37:27 +02:00
Regis Houssin
ca28aa7710 Fix: multicompany transverse mode compatibility 2012-09-26 12:10:25 +02:00
Regis Houssin
e9de123036 Fix: hide menu if empty 2012-09-26 12:09:14 +02:00
Regis Houssin
d08e66b0b8 Fix: add member module compatibility 2012-09-26 10:43:15 +02:00
Laurent Destailleur
81cc311844 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-09-25 21:31:20 +02:00
Laurent Destailleur
9e6defab04 Fix on total 2012-09-25 21:30:55 +02:00
Regis Houssin
f77911f25f Fix: indent 2012-09-25 19:34:18 +02:00
Regis Houssin
817e653519 Fix: add todo for free tag treatment 2012-09-25 18:31:08 +02:00
Christophe Battarel
67333522b0 add ability to remove a product tab if it's defined in a module description 2012-09-25 14:42:58 +02:00
Regis Houssin
d01f68a7af Fix: try to fix codesniffer error 2012-09-25 12:07:26 +02:00
Regis Houssin
a828d53074 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-09-25 08:13:03 +02:00
Regis Houssin
537152f950 Fix: regression 2012-09-25 08:10:12 +02:00
Christophe Battarel
2d911c097b update french translation for LocalTaxDesc 2012-09-25 08:06:47 +02:00
Regis Houssin
338f0b06d9 Fix: missing changes in migration file 2012-09-25 08:06:39 +02:00
Laurent Destailleur
c5ed476f25 Merge pull request #412 from atm-maxime/develop 
Task # 104 : Can create an invoice from several orders
 2012-09-24 16:05:19 -07:00
Laurent Destailleur
3b8104f013 Merge pull request #410 from marcosgdf/minor 
Fixed dictionary form
 2012-09-24 16:03:51 -07:00
Laurent Destailleur
f17906b331 Merge pull request #413 from aspangaro/develop 
Add a new column in llx_c_tva
 2012-09-24 16:03:05 -07:00
Laurent Destailleur
043e5edc2c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-09-24 21:37:36 +02:00
Laurent Destailleur
7d83fdce5b Fix: Several fixes into date functions 
Qual: Add PHPUnit tests
 2012-09-24 21:37:19 +02:00
Regis Houssin
9792d5a289 Fix: use company name if firstname and lastname not exists 2012-09-24 12:12:37 +02:00
Regis Houssin
1d344ec89c Fix: increase length, is too restrictive 
Fix: use company name if lastname and firstname not exists
 2012-09-24 11:01:27 +02:00
Regis Houssin
c268a62cab Fix: try to disable 1900 test 2012-09-24 09:30:37 +02:00
Spangaro Alexandre
ba45295c7e Working for accountancy 2012-09-24 07:14:39 +02:00
Spangaro Alexandre
96dd6efae0 Minor fix for llx_c_tva 2012-09-24 07:14:38 +02:00
Spangaro Alexandre
a6f9111b54 Add new column in llx_c_tva 2012-09-24 07:14:37 +02:00
Laurent Destailleur
d3ef78df47 Qual: Respect database rules 
Qual: Add indexes
 2012-09-24 00:10:01 +02:00
Laurent Destailleur
a6b2eab439 Revert bad fix. 
Unit tests are back ok (when tag is @6 or @=, yearoffset
is not zero but must not be applied when replacing yyyy). 
Compatibility with 3.2 is also restored.
 2012-09-23 22:09:54 +02:00
Laurent Destailleur
0741b907ee Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-09-23 22:03:08 +02:00
Laurent Destailleur
0c1651dbf3 Doxygen 2012-09-23 22:02:44 +02:00
Maxime Kohlhaas
bcbc35bd47 Task # 104 : added choice to auto close orders or not + translations 2012-09-23 18:00:30 +02:00
Maxime Kohlhaas
382bee4601 Task # 104 : added link on order list to the multi-orders invoice page 2012-09-23 17:59:50 +02:00
Regis Houssin
d147c360d3 FIXME: this code is useless, $yearoffset is 0 by default 2012-09-23 17:05:08 +02:00
Laurent Destailleur
2519783ce2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-09-23 16:26:13 +02:00
Laurent Destailleur
7fac6b65f6 Fix: Fix for compatibility with previous version and for case "@=". 
Qual: Add a lot of phpunit tests to validate all get_next_value()
cases.
 2012-09-23 16:25:08 +02:00
Spangaro Alexandre
d8481fa19b Minor fix 2012-09-23 12:05:03 +02:00
Laurent Destailleur
9bbe0e6b1c Qual: Mutuamize codeby using tpl. 
New: Support unique field for extrafields
 2012-09-22 20:27:06 +02:00
Marcos García
a24031dc19 Fixed dictionary form 
When creating or modifying an entry, id param was lost
Also, missing </form> added
 2012-09-22 15:13:23 +02:00
Regis Houssin
e721c6e723 Fix: more simple too 2012-09-22 10:40:12 +02:00
Regis Houssin
1e3cecf25c Fix: can use {yy}{mm} or {mm}{yy} 2012-09-22 10:33:25 +02:00
Regis Houssin
2ef521ff30 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-09-22 09:19:24 +02:00
Regis Houssin
6151bc3a42 Fix: more simple 2012-09-22 09:18:36 +02:00
Regis Houssin
d7bbd8e947 Merge pull request #409 from simnandez/develop 
Trad: Update ca_ES donations translation
 2012-09-22 00:13:23 -07:00
Regis Houssin
eee4434850 Fix: update doc 2012-09-22 09:03:38 +02:00
Regis Houssin
d48f494eb0 Fix: check fiscal date and new year 2012-09-22 08:53:10 +02:00
simnandez
a25f2eae46 Trad: Update ca_ES donations translation 2012-09-21 16:30:38 +02:00
Regis Houssin
ba1b282c3b Fix: remove unused code 2012-09-21 11:28:28 +02:00
Regis Houssin
00af89488c Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-09-21 11:24:19 +02:00
Regis Houssin
50b0dcf47e New: try to use new tag 2012-09-21 11:23:31 +02:00
Laurent Destailleur
73562b7fc1 Use correct status for select 2012-09-21 09:33:12 +02:00
Regis Houssin
5ce44eff57 Fix: more simple 
Fix: eclipse auto align is bad !!! ;-)
 2012-09-21 08:50:23 +02:00
Regis Houssin
622f5dff59 Fix: use order entity instead customer entity 2012-09-21 08:23:48 +02:00
Laurent Destailleur
84089f3e53 Fix: bas tabs when socid provided into stats pages 2012-09-21 00:28:11 +02:00
Laurent Destailleur
320b24bca1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-09-21 00:13:41 +02:00
Laurent Destailleur
5e9cd37107 Uniformise look of PHP Info page. 2012-09-21 00:13:20 +02:00
Laurent Destailleur
c5bda9b1d5 Hide feature not available 2012-09-20 23:01:24 +02:00
Laurent Destailleur
408a4553ee Help center at end (because we leave software) 2012-09-20 22:54:05 +02:00
Laurent Destailleur
cf4be61349 Merge pull request #407 from simnandez/develop 
[ task #104 ] Possibilité de facturer plusieurs commandes. Working
 2012-09-20 10:54:19 -07:00
Laurent Destailleur
22a28abed1 Fix: Add more sql fix commands 2012-09-20 17:46:47 +02:00
simnandez
38b7aa69cb [ task #104 ] Possibilité de facturer plusieurs commandes. Working 2012-09-20 15:57:53 +02:00
simnandez
77ecd5c6fc [ task #104 ] Possibilité de facturer plusieurs commandes. Working 2012-09-20 15:55:51 +02:00
Laurent Destailleur
4881d8f1c2 Fix: Horizontal scrolling 2012-09-20 14:52:31 +02:00
Regis Houssin
073170514f Fix: increase memory limit 2012-09-20 09:13:02 +02:00
Laurent Destailleur
05e20b8f30 New: Can exclude some type of events 2012-09-20 00:42:51 +02:00
Laurent Destailleur
44591bd756 Use a specific type to isolate type of event that are event 
automatically added into agenda from other predefined events.
 2012-09-20 00:18:29 +02:00
Laurent Destailleur
596b12cacc Fix: sort in dictionnaries 2012-09-20 00:14:40 +02:00
Laurent Destailleur
5ea03e7448 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-09-19 20:45:43 +02:00
Laurent Destailleur
8b0cc3a953 Fix: Date format 2012-09-19 20:45:20 +02:00
Regis Houssin
d58c106f66 Fix: convert line delimiters !!! 2012-09-19 17:53:09 +02:00
Regis Houssin
63a68d0d1c Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-09-19 17:35:14 +02:00
Laurent Destailleur
b2825e1af3 Merge pull request #406 from simnandez/develop 
Develop
 2012-09-19 08:30:16 -07:00
Regis Houssin
98b38628c5 Fix: optimizing 2012-09-19 17:24:40 +02:00
Regis Houssin
40f5427520 Fix: broken features, ready for doliforge 2012-09-19 17:18:52 +02:00
Laurent Destailleur
cd3d01127c Merge pull request #404 from grandoc/develop 
fix: Warning : Invalid argument supplied for foreach()
 2012-09-19 07:40:43 -07:00
simnandez
5344d0c330 Fix: Update spanish VAT data for first instalations 2012-09-19 16:15:35 +02:00
simnandez
31b91e68c1 Fix: Update spanish VAT data for first instalations 2012-09-19 16:09:41 +02:00
simnandez
1be38732d6 Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop 2012-09-19 16:04:15 +02:00
Laurent Destailleur
8b7342f0ea New: Project notes use the note.tpl templates 2012-09-19 16:03:17 +02:00
simnandez
d18488966b Fix: Update spanish VAT data for first instalations 2012-09-19 15:51:00 +02:00
Laurent Destailleur
21c4baa13b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-09-19 15:10:39 +02:00
Laurent Destailleur
2ac3fbc5c6 New: Add clipart for holiday module 2012-09-19 15:10:23 +02:00
Grand Philippe
aa7cd880c0 fix: Warning : Invalid argument supplied for foreach() 2012-09-19 15:07:06 +02:00
Laurent Destailleur
533e285dad Merge pull request #403 from simnandez/develop 
Trad: Add ca_ES and es_ES translations
 2012-09-19 05:53:43 -07:00
Laurent Destailleur
9bc0011290 Merge pull request #405 from cbattarel/develop 
correct some ajax bugs caused by tpl recent updates
 2012-09-19 05:53:29 -07:00
Laurent Destailleur
a68483d72f Uniformize code. 2012-09-19 14:49:13 +02:00
Laurent Destailleur
0b4df34091 Fix: Blank page when renaming product ref 2012-09-19 14:16:29 +02:00
Laurent Destailleur
0e76bd7ac6 Fix: Blank page when renaming a product ref 2012-09-19 14:11:01 +02:00
Laurent Destailleur
9306360d3c Remove warnings 2012-09-19 13:39:47 +02:00
Laurent Destailleur
d1cfe2ec54 Fix: Bug when metafile is on 2012-09-19 13:30:59 +02:00
Laurent Destailleur
1347ecf14e Qual: Removed warnings 2012-09-19 12:49:58 +02:00
Christophe Battarel
de93c819f4 correct some ajax bugs caused by tpl recent updates 2012-09-19 12:02:06 +02:00
Laurent Destailleur
60fc0f2b74 Removed warning 2012-09-19 11:56:50 +02:00
simnandez
875edcad0d Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/install/mysql/migration/3.2.0-3.3.0.sql
 2012-09-19 10:32:00 +02:00
simnandez
cf72ffd650 Trad: Improve bank translations for adjust into pdf info size 2012-09-18 18:50:02 +02:00
simnandez
13aeca2ffd Fix: Add type of product/service into factures for a correct localtaxes 
calculation
 2012-09-18 18:27:28 +02:00
Laurent Destailleur
89dfd246d1 Init data must match migrated data 2012-09-18 18:27:10 +02:00
simnandez
b7837f9280 Fix: Localtaxes type only missing in propal update line 2012-09-18 18:18:30 +02:00
Grand Philippe
2bcbd7dc2a fix: Warning : Invalid argument supplied for foreach() 2012-09-18 18:00:05 +02:00
simnandez
dd9d3c8ba4 Fix: localtaxes must display in pdf even if they are in negative 2012-09-18 17:57:52 +02:00
simnandez
0bf29edb60 Fix: Add type of product/service into commandes for a correct 
localtaxes calculation
 2012-09-18 17:41:59 +02:00
simnandez
76f3fb56ea Fix: Add type of product/service into propals for a correct localtaxes 
calculation
Fix: Localtax2_type for Spain must be 3
 2012-09-18 16:06:45 +02:00
simnandez
fab101d2e8 Fix: Spanish localtax1 must be only applicable to products 
Add localtax2_type
 2012-09-18 15:38:08 +02:00
simnandez
b65c23576a Trad: Add ca_ES and es_ES translations 2012-09-18 15:28:38 +02:00
Laurent Destailleur
889f71db6f Fix: Color of lines must be set for each lines 2012-09-18 12:52:54 +02:00
Laurent Destailleur
303f0dc681 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2012-09-18 11:09:44 +02:00
Laurent Destailleur
ffbe2acc36 Fix: use https if https is used 2012-09-18 11:06:49 +02:00
Laurent Destailleur
4f0e4be449 Merge pull request #402 from cbattarel/develop 
add option to select contact type associated to commercial agents for margin and commission modules
 2012-09-18 01:24:00 -07:00
Christophe Battarel
951b98a963 add option to select contact type associated to commercial agents for margin and commission modules 2012-09-18 09:44:34 +02:00
Laurent Destailleur
eb964e6436 Fix: Should works for everybody like that 2012-09-17 22:08:41 +02:00
Laurent Destailleur
4065b52441 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-09-17 22:05:36 +02:00
Laurent Destailleur
4a98c08a74 Fix: Use correct date timezone. 2012-09-17 22:05:13 +02:00
Regis Houssin
8bab5fdadd Fix: convert line delimiters 2012-09-17 19:37:02 +02:00
Regis Houssin
58ae3b9372 Fix: possibility to disable hook 2012-09-17 19:36:43 +02:00
Regis Houssin
dc7100677a Fix: avoid warning if no object 2012-09-17 16:28:37 +02:00
Regis Houssin
c42cf7ce78 Fix: broken features 2012-09-17 16:16:48 +02:00
Laurent Destailleur
7167edb244 Fix: Comment to avoid bug 2012-09-17 16:00:41 +02:00
Laurent Destailleur
237bcf35ed Merge pull request #401 from grandoc/develop 
missing translation
 2012-09-17 06:23:20 -07:00
Laurent Destailleur
ef4831d119 Solved FIXME. I keep the code but commented, to keep source the more 
similar as possible than invoices.
 2012-09-17 11:46:50 +02:00
Grand Philippe
d25e8fc584 missing translation 2012-09-17 11:18:20 +02:00
Regis Houssin
16ad953d10 Fix: best practice 2012-09-17 08:13:29 +02:00
Regis Houssin
80eceab230 Fix: restore broken features 2012-09-17 07:15:38 +02:00
Regis Houssin
10b122578e FIXME: $deja_regle not use in proposal? 2012-09-17 06:52:33 +02:00
Regis Houssin
bf008c7640 Fix: optimizing 2012-09-17 06:43:58 +02:00
Laurent Destailleur
cd6a8fa761 New: Uniformize code 2012-09-17 02:07:14 +02:00
Laurent Destailleur
9ab0653902 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-09-17 01:39:49 +02:00
Laurent Destailleur
3953be53a7 Qual: Mutualize code 
New: Can use extrafields on contacts/addresses.
 2012-09-17 01:39:30 +02:00
Laurent Destailleur
2170801fd2 New: Uniformize pdf generation code. We also keep space to repeat pdf 
head info.
 2012-09-17 00:43:23 +02:00
Laurent Destailleur
832a472325 Little clean of page 2012-09-16 22:45:58 +02:00
Regis Houssin
ada85df649 Fix: wrong permission 2012-09-16 21:12:55 +02:00
Laurent Destailleur
07fa800360 Fix: Correct concat when mixing not html and html descriptions 2012-09-16 20:23:57 +02:00
Laurent Destailleur
df3227ef7e Migrate spain to localtax type. 2012-09-16 16:56:24 +02:00
Laurent Destailleur
b724a78cb3 Fix: Debug dictionnary to add localtaxes 2012-09-16 15:04:55 +02:00
Laurent Destailleur
df2bac35c6 Merge pull request #399 from cbattarel/develop 
patch on the dictionnary setup of local taxes table to be able to set localtax type
 2012-09-16 04:40:54 -07:00
Christophe Battarel
a9ed3bc175 correction for previous patch on localtax 2012-09-16 10:12:43 +02:00
Christophe Battarel
05971f1952 patch on the dictionnary setup of local taxes table to be able to set localtax type 2012-09-16 10:08:41 +02:00
Laurent Destailleur
d48f294531 New: [ task #289 ] Reorder tasks 2012-09-15 15:33:00 +02:00
Laurent Destailleur
9147911ae4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/core/tpl/freeproductline_create.tpl.php
	htdocs/core/tpl/predefinedproductline_create.tpl.php
 2012-09-15 13:53:19 +02:00
Laurent Destailleur
4566595d44 Fix: W3C when module margin is on 2012-09-15 13:44:40 +02:00
Laurent Destailleur
1fb26e2ab2 Fix: if 1 experimental module is on, we must always show tab 2012-09-15 13:37:55 +02:00
Regis Houssin
89e70cd61a Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-09-15 11:22:30 +02:00
Regis Houssin
43c0a03758 Fix: strict mode tornado 2012-09-15 11:21:22 +02:00
Regis Houssin
85a756bee4 Merge pull request #398 from grandoc/develop 
dyslexie
 2012-09-15 01:05:08 -07:00
Regis Houssin
e19f8c54f1 Fix: strict mode hurricane 2012-09-15 10:01:35 +02:00
Regis Houssin
be13602c71 Fix: use getDocumentsLink method 2012-09-15 09:02:20 +02:00
Grand Philippe
f19321eaf6 dyslexie 2012-09-14 17:37:14 +02:00
Regis Houssin
4220229573 Fix: minor change 2012-09-14 15:56:50 +02:00
Regis Houssin
b33e59dd66 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-09-14 15:56:11 +02:00
Laurent Destailleur
e7d3d9496c first step for extrafield for contact/address 2012-09-14 12:15:55 +02:00
Regis Houssin
3a6be2b896 Fix: uniformize code 
fix: add current user for commercial by default
 2012-09-14 11:34:30 +02:00
Laurent Destailleur
643d6ff3f9 Fix: Debug feature predefined invoices 2012-09-14 10:09:56 +02:00
Regis Houssin
968380ba3e Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-09-13 18:50:29 +02:00
Laurent Destailleur
46ee00fc5e A party to fish bugs and merou. 2012-09-13 18:28:03 +02:00
Regis Houssin
f902fedbb8 Fix: split for more possibility 2012-09-13 17:43:24 +02:00
Laurent Destailleur
0a5c49b3d9 Fix: If no warehouse selected, no warning for stock in warehouse too 
low.
 2012-09-13 16:23:58 +02:00
Regis Houssin
125f499e82 Fix: dol_htmloutput_events is already call in llxFooter 2012-09-13 16:15:36 +02:00
Laurent Destailleur
af5507bcfa Fix: restore correct behaviour. Space is output only if there is an img 
+ text. img alone is not enough.
 2012-09-13 16:13:12 +02:00
Regis Houssin
84c61c9411 Fix: remove obsolete code and use "propal" instead "propale" 2012-09-13 16:11:08 +02:00
Regis Houssin
7eef637776 Fix: strict mode killer 2012-09-13 11:52:50 +02:00
Laurent Destailleur
ed61508b3f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-09-13 10:14:47 +02:00
Laurent Destailleur
4cc56f0176 New: Extra fields supports more types (now int, string, double, date, 
datetime)
 2012-09-13 10:14:25 +02:00
Regis Houssin
6561694658 Fix: invert space 2012-09-13 10:03:58 +02:00
Regis Houssin
1fa84aa92b Fix: better 2012-09-13 10:02:45 +02:00
Regis Houssin
9130dbda4e Fix: wrong space 2012-09-13 09:57:12 +02:00
Regis Houssin
b1e01b50f5 Fix: use warning icon for limit size of tab 
Fix: optimizing textwithtooltip method
 2012-09-13 09:52:03 +02:00
Laurent Destailleur
29b4e1f57a Removed not available module from demo 2012-09-13 09:19:45 +02:00
Laurent Destailleur
4b1c863673 Fix: removed warnings 2012-09-12 23:59:19 +02:00
Laurent Destailleur
a950f775e5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-09-12 20:50:00 +02:00
Laurent Destailleur
82435fb176 Merge pull request #396 from marcosgdf/translations 
Removed unused lines mistakenly introduced in previous PR #395
 2012-09-12 11:45:56 -07:00
Laurent Destailleur
c11c3897ef Qual: Uniformize code 2012-09-12 20:45:01 +02:00
Laurent Destailleur
b221b8878e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-09-12 20:34:25 +02:00
Laurent Destailleur
91e304d0d7 Move dev and experimental modules into a separated tab 2012-09-12 20:33:50 +02:00
Marcos García
c38274c111 Forgot to remove some lines... 2012-09-12 20:32:39 +02:00
Laurent Destailleur
d5e8037483 Merge pull request #395 from marcosgdf/translations 
Improved translations
 2012-09-12 11:08:55 -07:00
Laurent Destailleur
bd49dc81a3 Merge pull request #394 from simnandez/develop 
Localtaxes also in skip_update_total comprobation
 2012-09-12 10:54:42 -07:00
Regis Houssin
5770245805 Fix: rename the hook 2012-09-12 19:37:37 +02:00
Marcos García
cb4044755b Fixed export translations 
Added missing strings
Corrected some translations
 2012-09-12 19:11:03 +02:00
simnandez
4ac2ee83f2 Localtaxes also in skip_update_total comprobation 2012-09-12 19:07:23 +02:00
Regis Houssin
28e5ba6c18 Fix: mini strict mode 2012-09-12 18:47:06 +02:00
simnandez
2e37084c55 Fix: If price is 'TTC' we need to have the totals without VAT for a 
correct
calculation
Fix: The updateline of propal must include the localtaxes totals
 2012-09-12 17:48:45 +02:00
Laurent Destailleur
dd66ebd3f6 New: Use GB address format 2012-09-12 17:39:02 +02:00
Marcos García
be174c6b46 Fixed problem with accentuated strings 2012-09-12 17:32:14 +02:00
Laurent Destailleur
040dd09f5d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-09-12 17:25:01 +02:00
Laurent Destailleur
41078019dd Make demo of foundation at end 2012-09-12 17:24:39 +02:00
Laurent Destailleur
a7ddbf8f10 Use key value if translation not found 2012-09-12 16:56:30 +02:00
Regis Houssin
f16a68bf01 Fix: remove unused tables 2012-09-12 16:40:46 +02:00
Regis Houssin
3bdda8429d Merge pull request #392 from marcosgdf/minor 
Fixed incorrect BackToList link
 2012-09-12 07:23:03 -07:00
Marcos García
d5fc2a9488 Fixed incorrect BackToList link 2012-09-12 16:11:16 +02:00
Regis Houssin
a663f8fb3b Fix: remove obsolete code 2012-09-12 16:02:01 +02:00
Regis Houssin
b78b0830d1 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-09-12 14:56:23 +02:00
Regis Houssin
664ceb7f2c Fix: This is a 'superglobal', there is no need to do 'global $variable;' 
to access it within functions or methods.
 2012-09-12 14:55:39 +02:00
Laurent Destailleur
11bb601059 Merge pull request #386 from marcosgdf/translations 
Added missing translations
 2012-09-12 05:53:40 -07:00
Laurent Destailleur
c9678e3f1d Merge pull request #391 from marcosgdf/minor 
Fixed xinputuser emailing module
 2012-09-12 05:53:12 -07:00
Regis Houssin
a2f1107bfc Fix: add GET in hook parameters 2012-09-12 14:49:36 +02:00
Marcos García
98092b952d Fixed xinputuser emailing module 
Lastname wasn't being recorded
 2012-09-12 14:49:02 +02:00
Laurent Destailleur
ce1b759c47 Merge pull request #390 from cbattarel/develop 
use selected value in contact type list + remove duplicate print statement
 2012-09-12 04:18:32 -07:00
Laurent Destailleur
71c25bb939 Hide not frequently used third level menus entries. 2012-09-12 13:01:20 +02:00
Christophe Battarel
8111909340 use selected value in contact type list + remove duplicate print statement 2012-09-12 12:55:45 +02:00
Regis Houssin
7358223c8f Fix: convert line delimiters 2012-09-12 12:41:44 +02:00
Regis Houssin
b75efdcf10 Fix: regression, replace triggers by hooks 2012-09-12 12:27:11 +02:00
Laurent Destailleur
8fd384373a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-09-12 10:57:09 +02:00
Regis Houssin
2557320f8d Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-09-12 10:47:17 +02:00
Regis Houssin
71d5191ff7 Fix: duplicate parameters 2012-09-12 10:46:35 +02:00
Stephen L
8fcf20227a Fix: definition of all substitution functions is no more required 
Signed-off-by: Stephen L. <lrq3000@gmail.com>
 2012-09-11 20:15:03 +02:00
Laurent Destailleur
54be534506 Add comment and renamed file to be sure new function is not called 
directly. Not sure it's a good idea to have dolDeleteFile separated
since it must be called only by dol_delete_file.
 2012-09-11 20:06:37 +02:00
Regis Houssin
b39c9c514a Fix: split into 2 functions 2012-09-11 18:52:23 +02:00
Regis Houssin
3e033ef48c Fix: doc 2012-09-11 17:09:43 +02:00
Regis Houssin
1d6645c5c4 Fix: rename this method 2012-09-11 17:08:29 +02:00
Regis Houssin
f95d611f12 New: add hooks in dol_delete_file and list_of_documents methods 2012-09-11 17:08:10 +02:00
Regis Houssin
c6c2fd2f39 Fix: restore previous field type 2012-09-11 16:07:52 +02:00
Laurent Destailleur
a249061017 Fix: If object already loaded, the url was not returned. 2012-09-11 15:49:46 +02:00
Laurent Destailleur
bf9b8657c3 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2012-09-11 15:43:29 +02:00
Laurent Destailleur
c10e587870 Fix: Bad init of specimen 2012-09-11 15:42:41 +02:00
Regis Houssin
a798069322 Merge pull request #388 from cbattarel/develop 
add en_US language files for commissions and margins modules
 2012-09-11 06:35:07 -07:00
Regis Houssin
97fffe7b62 Merge pull request #387 from marcosgdf/minor 
Search thirds from barcode directly from the mini search box
 2012-09-11 06:34:32 -07:00
Christophe Battarel
37b166024d add en_US language files for commissions and margins modules 2012-09-11 15:20:00 +02:00
Marcos García
85064abdad Search thirds from barcode directly from the mini search box 
Also added a check when generating barcode image
 2012-09-11 14:27:41 +02:00
Laurent Destailleur
1c91027a4e Fix: Uniformize pdf code. Try to solve offset when a product line is 
moved onto next page.
 2012-09-11 14:03:16 +02:00
Marcos García
d3eed9f15e Removed '=undefined' from translation files 2012-09-11 12:43:15 +02:00
Marcos García
f7fff8ecb3 Added missing translations removed in PR #371 2012-09-11 12:40:08 +02:00
Laurent Destailleur
c291ea2ec2 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2012-09-11 11:23:08 +02:00
Regis Houssin
7712b1c25f Merge pull request #385 from marcosgdf/translations 
Improved translations
 2012-09-10 20:30:25 -07:00
Laurent Destailleur
12b42ab1b4 Doc 2012-09-11 01:53:15 +02:00
Laurent Destailleur
ef00d592e7 Fix: Backward compatibility with spain. 2012-09-11 01:42:50 +02:00
Laurent Destailleur
e68f861923 New: Add more test and enhancement to make new calcul_price function 
more reliable. We need to add more PHPUnit test case on this function
(testcase using localtax1 and localtax2).
 2012-09-11 01:09:34 +02:00
Marcos García
f2393f08bc Translated paper formats and size units in PDF admin page 2012-09-11 00:36:49 +02:00
Marcos García
b3235887d3 Improved translations of menu edit 2012-09-10 23:50:46 +02:00
Laurent Destailleur
b6239427f6 Merge pull request #382 from cbattarel/localtax 
calculate prices with generic local taxes management
 2012-09-10 14:36:44 -07:00
Laurent Destailleur
6159e71427 Merge pull request #384 from marcosgdf/task-539 
Better practice
 2012-09-10 14:32:42 -07:00
Marcos García
62b7ba607d Better practice 
Replaced `empty($conf->global->MAIN_MODULE_BARCODE)` with `empty($conf->barcode->enabled)`
 2012-09-10 23:23:25 +02:00
Laurent Destailleur
3a18633df3 Merge pull request #383 from marcosgdf/task-539 
Task #539 - Add new products into proposals,invoices... with barcode
 2012-09-10 14:04:50 -07:00
Laurent Destailleur
de339278bc Fix: removed warning 2012-09-10 22:59:50 +02:00
Marcos García
61e2596e4d Task #539 - Add new products into proposals,invoices... with barcode 2012-09-10 22:55:12 +02:00
Laurent Destailleur
4c05112662 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2012-09-10 17:11:15 +02:00
Regis Houssin
de54481129 Merge pull request #381 from marcosgdf/minor 
Translation improvements
 2012-09-10 07:56:37 -07:00
Christophe Battarel
c6da5b79fe change localtaxes parameters to be compatible with older calls 2012-09-10 16:49:36 +02:00
Laurent Destailleur
4847e946a4 Fix: Use varchar instead of char (for better compatibility, char is an 
old directive)
Fix: Restore usage of text field for "enabled" menu because, even if in
standard code, we use 0 or 1, into external module, or menu editor we
should be able to use full condition dynamic string.
 2012-09-10 16:20:34 +02:00
Christophe Battarel
8c11da1df8 readapt to 3.3 2012-09-10 16:01:20 +02:00
Christophe Battarel
4cca760feb calculate prices with generic local taxes management 2012-09-10 15:47:33 +02:00
Laurent Destailleur
09d3d0a37d Fix: removed warning 2012-09-10 15:47:13 +02:00
Marcos García
d7d1c8ac65 Missing paper formats unit translations 2012-09-10 15:14:29 +02:00
Regis Houssin
ba2f986282 Fix: [ bug #537 ] Fatal error: Using $this when not in object context 2012-09-10 14:40:32 +02:00
Regis Houssin
6162d296ce Fix: strict mode cowboy 2012-09-10 14:30:33 +02:00
Marcos García
b92f52cdf9 Social charges deductible field now with yes/no select 2012-09-10 14:12:31 +02:00
Regis Houssin
26ff406e4a Fix: use MODIFY instead CHANGE for just change the type of field 2012-09-10 13:25:34 +02:00
Regis Houssin
e9c72f812d Merge pull request #380 from marcosgdf/minor 
Modified llx_menu sql and improved add menu form
 2012-09-10 04:18:31 -07:00
Marcos García
74b28dab79 Merge branch 'develop' into minor 
Conflicts:
	htdocs/install/mysql/migration/3.2.0-3.3.0.sql
 2012-09-10 12:16:45 +02:00
Regis Houssin
9188a24c78 Merge pull request #379 from marcosgdf/translations 
Improved translations
 2012-09-10 03:07:07 -07:00
Regis Houssin
83179fc4f0 Merge pull request #378 from cbattarel/localtax 
prepare database for local taxes management (2nd try) - task 204 on doliforge
 2012-09-10 03:04:31 -07:00
Regis Houssin
4269878e6d Fix: restore varchar for the moment 2012-09-10 11:59:17 +02:00
Marcos García
f0803a7713 Improved es_ES translations 2012-09-10 11:15:54 +02:00
Christophe Battarel
2e4aa1131a prepare database for local taxes management 
add localtax1_type and localtax2_type in database.
these type are char(1) and support following values :
'0' : local tax not applied
'1' : local tax apply on products and services without vat (vat is not applied on local tax)
'2' : local tax apply on products and services before vat (vat is calculated on amount + localtax)
'3' : local tax apply on products without vat (vat is not applied on local tax)
'4' : local tax apply on products before vat (vat is calculated on amount + localtax)
'5' : local tax apply on services without vat (vat is not applied on local tax)
'6' : local tax apply on services before vat (vat is calculated on amount + localtax)
'7' : local tax is a fix amount applied on global invoice
 2012-09-10 11:00:35 +02:00
Regis Houssin
e1fcaf738f Fix: move llx_ecm_documents in external module 2012-09-10 10:55:06 +02:00
Laurent Destailleur
66af48697c Doc 2012-09-10 10:25:47 +02:00
Laurent Destailleur
1a746ad99b Merge pull request #377 from GPCsolutions/societe_commercial 
Inverted the clause for commercial_id affectation
 2012-09-10 01:21:38 -07:00
Raphaël Doursenaud
75647aa19d Inverted the clause for commercial_id affectation 
This permits using a script to import commercial_id.
The clause to automatically affect the current user as commercial doesn't seem to work anyway
 2012-09-10 10:00:22 +02:00
Laurent Destailleur
3335bf629b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-09-10 09:47:11 +02:00
Laurent Destailleur
1d341caffd Merge pull request #376 from simnandez/develop 
Fix: use $ldap instead $this
 2012-09-10 00:46:35 -07:00
simnandez
f390bec1ac Fix: use $ldap instead $this 2012-09-10 09:06:37 +02:00
Marcos García
45cd500882 Modified llx_menu sql and improved new menu form 
Modified `enabled` field to tinyint(1) because only holds 0 or 1
Enabled input field now made yes/no select
 2012-09-10 02:09:52 +02:00
Marcos García
5536fecc3b Missing translations & improved es_ES translations 2012-09-10 01:15:57 +02:00
Regis Houssin
61159ca220 Fix: use specific hash for ref 2012-09-09 22:05:53 +02:00
Laurent Destailleur
3b3e67758e Fix: Removed warnings 2012-09-09 20:33:00 +02:00
Regis Houssin
5ff1240287 Fix: increase size for big path and where data is encrypted 2012-09-09 18:28:36 +02:00
Regis Houssin
d7f3deffce Fix: convert line delimiters 2012-09-09 16:32:03 +02:00
Regis Houssin
a7bfc722d5 Fix: use specific variable 2012-09-09 16:31:00 +02:00
Regis Houssin
9058439015 Fix: best practice 2012-09-09 16:17:19 +02:00
Laurent Destailleur
1450ee1978 Merge pull request #375 from marcosgdf/barcode-mini-search 
Added Copyright and changelog entry
 2012-09-09 06:34:26 -07:00
Laurent Destailleur
83cdb2167e Fix: Use bad parameter name 2012-09-09 15:23:09 +02:00
Marcos García
94090e85db Added Copyright and changelog entry 2012-09-09 15:12:04 +02:00
Laurent Destailleur
fcce22026a Fix: Bad name of var 2012-09-09 15:09:54 +02:00
Laurent Destailleur
8f20d31b4f Merge pull request #374 from marcosgdf/barcode-mini-search 
Allow to search barcodes in the permanent mini search box
 2012-09-09 06:04:20 -07:00
Laurent Destailleur
e0624abb2c Added option THEME_ELDY_USE_HOVER to enable mouse hover, because when 
using software a lot, it becomes annoying. So we let user choose
(choice possible only with eldy theme for the moment).
 2012-09-09 14:49:20 +02:00
Marcos García
33c1fd2a01 Allow to search barcodes in the permanent mini search box 
Requested by Joaquim in Dolibarr.es forum
http://dolibarr.es/index.php/foro/9-sugerencias/1337-buscador-de-la-izquierda/
 2012-09-09 14:43:41 +02:00
Laurent Destailleur
2c2d17b101 Fix: Try a fix to avoid having the hover on array that should not have 
it.
 2012-09-09 13:13:24 +02:00
Laurent Destailleur
a551fa982e Comments 2012-09-08 21:29:03 +02:00
Laurent Destailleur
4f72b0ea92 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-09-08 18:58:15 +02:00
Laurent Destailleur
5bd14b20d5 Trans: Add bg_BG language and fix monor strings 
Fix: Removed warning into autotranslator tool.
 2012-09-08 18:57:52 +02:00
Regis Houssin
0a61f13c7a Fix: restore broken features 2012-09-08 18:10:19 +02:00
Regis Houssin
7a0b8b3b1a Fix: saturday strict mode 2012-09-08 17:43:14 +02:00
Laurent Destailleur
4ac14fd927 Merge pull request #371 from simnandez/develop 
Try to enable hover in lists into auguria and eldy themes
 2012-09-08 06:27:28 -07:00
Laurent Destailleur
39ca93bb7a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-09-08 15:18:37 +02:00
Laurent Destailleur
ce64a26875 A different fix to keep username. 2012-09-08 15:18:14 +02:00
Laurent Destailleur
600915b8ec Revert "Revert "Fix: GETPOST is already in method"" 
This reverts commit 0d13b80fec.
 2012-09-08 15:17:53 +02:00
Regis Houssin
d2e336ddd6 Fix: GET and POST treatment in dol_loginfunction() 2012-09-08 15:16:27 +02:00
Laurent Destailleur
26d3234dc8 Update pt_PT 2012-09-08 15:12:12 +02:00
Laurent Destailleur
0d13b80fec Revert "Fix: GETPOST is already in method" 
This reverts commit c4f3e872ca.
 2012-09-08 13:33:52 +02:00
Laurent Destailleur
5641a451d5 Revert "Fix: GETPOST is already in method" 
This reverts commit ce26a3cc81.
 2012-09-08 13:33:48 +02:00
Regis Houssin
ce26a3cc81 Fix: GETPOST is already in method 2012-09-08 13:24:10 +02:00
Laurent Destailleur
00ceaf9fac Sec: XSS hole 2012-09-08 13:19:54 +02:00
Laurent Destailleur
0cf89eac08 Doxygen 2012-09-08 02:17:08 +02:00
Laurent Destailleur
a7fdbcbddc Update auguria module 2012-09-08 02:03:47 +02:00
Laurent Destailleur
1721f564c8 Increase size of field into database 2012-09-08 01:42:15 +02:00
Laurent Destailleur
d0528740c2 Fix: We must not show date range for a product line type (only 
service line)
 2012-09-08 01:02:54 +02:00
Laurent Destailleur
7c27cfa88e Fix: br at wrong place (a different fix that should be ok in all cases) 2012-09-08 00:58:14 +02:00
Laurent Destailleur
1280499110 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-09-08 00:52:59 +02:00
Laurent Destailleur
265ef489a6 Merge menu "System info" with "System tools" 2012-09-08 00:52:44 +02:00
Regis Houssin
c98e456ba9 Fix: missing <br> and strict mode 2012-09-07 18:16:05 +02:00
Regis Houssin
d60211a7c8 Fix: update entity field 2012-09-07 17:43:27 +02:00
Regis Houssin
ee1cf819f7 Fix: mass convert line delimiters 2012-09-07 17:23:16 +02:00
Regis Houssin
5270ec06cb Fix: compatibility with multicompany transverse mode 2012-09-07 17:20:12 +02:00
Regis Houssin
ab5e4db9c0 Fix: possibility to use with another element 2012-09-07 13:47:35 +02:00
Regis Houssin
847a335ee5 TODO: just use ajaxdirtree.php for load database after ajax refresh and 
not scan directories, too slow every page loaded !
 2012-09-07 13:33:13 +02:00
Regis Houssin
830ec2d4fb Fix: reload page after refresh 2012-09-07 13:28:38 +02:00
Regis Houssin
2ee6f33f72 New: add ajax refresh method and code more clear 2012-09-07 13:27:12 +02:00
Regis Houssin
928aae7f79 Fix: strict mode day 2012-09-07 11:40:59 +02:00
Regis Houssin
77bbae7723 Fix: remove older models for avoid warnings 2012-09-07 11:18:08 +02:00
Regis Houssin
b6dc20fb90 Fix: send $varfiles instead _FILES 2012-09-07 10:58:29 +02:00
Regis Houssin
e725ef0eef Fix: find $upload_dir in first part of $dest_file 2012-09-07 10:54:56 +02:00
Regis Houssin
68c71896d4 Fix: add extraparams field for more parameters 2012-09-07 10:50:19 +02:00
Laurent Destailleur
0dfc9e59fe New: Creation of meta file works for all elements. Disabled by default. 2012-09-07 10:30:02 +02:00
Laurent Destailleur
eb3a262289 Fix: br at wrong place 2012-09-07 10:03:25 +02:00
Regis Houssin
171f25d3b2 Fix: getDirList is ambiguous, this method can return dir list or files 
list. Method is renamed to "getNodesList"
 2012-09-07 08:47:10 +02:00
Regis Houssin
b6f090eeef Fix: add notrigger parameter 2012-09-07 08:09:07 +02:00
Laurent Destailleur
13d6024a9f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-09-07 00:15:08 +02:00
Laurent Destailleur
1275a41244 New: Start to work on position of tasks into a project 2012-09-07 00:14:50 +02:00
Laurent Destailleur
28e7b73d21 Enhancement of holiday module 2012-09-06 23:58:09 +02:00
Laurent Destailleur
6e90e60268 Fix data init 2012-09-06 23:46:35 +02:00
Regis Houssin
83fbaac70d New: add hook in dol_move_uploaded_file method and split function with 
dol_check_uploaded_file method
 2012-09-06 21:30:44 +02:00
Laurent Destailleur
221b671636 New: The signature feature is full ok now. 2012-09-06 19:07:51 +02:00
Regis Houssin
210662d39e Fix: [ bug #533 ] 2012-09-06 15:18:30 +02:00
Regis Houssin
282d9c9c29 Merge pull request #372 from cbattarel/develop 
dont use lines without buying price for margin calculation if ForceBuyPr...
 2012-09-06 06:10:51 -07:00
Christophe Battarel
2b010c9ba4 dont use lines without buying price for margin calculation if ForceBuyPriceIfNull is set 2012-09-06 13:49:39 +02:00
Regis Houssin
20751e0279 Fix: [ bug #533 ] Using quotes in intervention sheet description leads 
to empty description
 2012-09-06 12:55:54 +02:00
Regis Houssin
6f8b403c23 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-09-06 12:41:08 +02:00
Regis Houssin
b5ba6ef4d9 Fix: broken feature, enable source details by default 2012-09-06 12:37:36 +02:00
Regis Houssin
720d0d99b0 Fix: strict mode 2012-09-06 12:36:55 +02:00
Regis Houssin
3c63307087 Fix: remove dead code 2012-09-06 12:30:03 +02:00
Regis Houssin
4309705b4c Fix: bad array 2012-09-06 12:26:23 +02:00
Laurent Destailleur
055bb7a9b8 Fix: Restore correct includes. 
All entry pages must start with a require main.inc.php, except command
line script that start with master.inc.php.
To avoid errors into jenkins, we must exclude file common.inc.php.
All files ending *.inc.php must be excluded from jenkins because such
files are not "start/entry pages". That's the difference with
standard files *.php.
*.php
 2012-09-06 10:39:25 +02:00
Laurent Destailleur
1a2ead7bdf Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-09-06 10:22:56 +02:00
Laurent Destailleur
7f3013cd8f Fix: Show box even if order was not yet set 2012-09-06 10:22:33 +02:00
Laurent Destailleur
35c44896e4 Strict mode 2012-09-06 10:22:15 +02:00
Laurent Destailleur
0ec9793308 Fix: Bad test 2012-09-06 10:18:45 +02:00
Regis Houssin
00784ffce5 Fir: go to hell 2012-09-06 09:48:25 +02:00
Regis Houssin
c99e730e0c Fix: last try before asylum 2012-09-06 09:27:23 +02:00
Regis Houssin
7bd18ba840 Fix: phpunit error again ! pfff 2012-09-06 09:17:01 +02:00
Regis Houssin
c9ea50c51f Try another method 2012-09-06 09:09:00 +02:00
Regis Houssin
83dd81110d Fix: bad path the return 2012-09-06 09:01:54 +02:00
Regis Houssin
9e4ff47711 Fix: bad path 2012-09-06 08:52:31 +02:00
Regis Houssin
e0bb5f334d Try to avoid phpunit errors 2012-09-06 08:31:38 +02:00
Regis Houssin
0b057a071a Fix: for avoid phpunit errors 2012-09-06 08:24:29 +02:00
Laurent Destailleur
2141a33d53 Trans: Init bulgarian files 2012-09-06 00:17:45 +02:00
Laurent Destailleur
2ff87a2c1c Exclude dir 2012-09-05 20:41:58 +02:00
Laurent Destailleur
856c829c99 New: Add a selection module for emailing to enter a recipient from 
gui.
 2012-09-05 20:41:28 +02:00
Laurent Destailleur
655a288f8b Fix: Removed last separator line 2012-09-05 19:52:17 +02:00
Laurent Destailleur
76bdd878cf Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-09-05 19:35:42 +02:00
Laurent Destailleur
aef1e29ad7 Qual: Interface is more clear. 2012-09-05 19:35:04 +02:00
Regis Houssin
67f0313802 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-09-05 19:25:20 +02:00
Regis Houssin
9d67b04076 New: add possibility to force entity in login page 2012-09-05 19:22:03 +02:00
Laurent Destailleur
7059cdb07a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-09-05 18:33:01 +02:00
Laurent Destailleur
20bca1dd5a Qual: Removed useless page 2012-09-05 18:28:12 +02:00
simnandez
bae63a70a1 Trad: Add holiday first translation 2012-09-05 17:51:25 +02:00
Regis Houssin
3823e5d374 New: add possibility to add or force default directories 2012-09-05 17:37:58 +02:00
simnandez
99946d828c Trad: Add missing translations 2012-09-05 16:39:01 +02:00
Laurent Destailleur
2e2f156839 Fix: title 2012-09-05 16:20:51 +02:00
Laurent Destailleur
7910993d90 Update favicon 2012-09-05 15:35:26 +02:00
simnandez
ff0bf4417b Try to enable hover in lists into auguria and eldy themes 2012-09-05 15:29:21 +02:00
Laurent Destailleur
2aafe5eef1 Merge pull request #370 from simnandez/develop 
Develop
 2012-09-05 05:43:16 -07:00
Laurent Destailleur
765fd9341a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-09-05 14:42:20 +02:00
Laurent Destailleur
d02076f8f2 Strict mode war 2012-09-05 14:41:45 +02:00
simnandez
a3ecb1203b New: Add PRODUCT_PRICE_MODIFY trigger 2012-09-05 14:38:16 +02:00
Regis Houssin
4f056c707c Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-09-05 14:33:00 +02:00
Regis Houssin
c18375d7ee Fix: broken features 
$reshook may contain returns stacked by other modules
$reshook is always empty with an array for can not lose returns stacked
with other modules
$hookmanager->resArray may contain array stacked by other modules
 2012-09-05 14:30:12 +02:00
Laurent Destailleur
a3cb0e502e Uniformize code and add comment on localtax to prepare usage for other 
countries.
 2012-09-05 14:05:17 +02:00
Laurent Destailleur
00cd6a050d Uniformise code 2012-09-05 13:10:13 +02:00
Laurent Destailleur
0e1dcb9408 Use a more standard behaviour: If hook return non zero, it is a "replace 
code" hook. Otherwise, it is "insert code" hook.
 2012-09-05 13:05:24 +02:00
Laurent Destailleur
9496fdd20b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-09-05 13:00:01 +02:00
Laurent Destailleur
84438d82f4 Qual: Clean module 2012-09-05 12:59:33 +02:00
Regis Houssin
86f3c8eb26 Fix: return an array 2012-09-05 12:38:39 +02:00
Regis Houssin
696c7eb454 Fix: use require instead include_once 2012-09-05 11:22:52 +02:00
Laurent Destailleur
b20c8d97c0 Fix: Checkstyle 2012-09-05 11:20:52 +02:00
Laurent Destailleur
9c11092f46 Uniformize code 2012-09-05 11:15:38 +02:00
Regis Houssin
5be523faad Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-09-05 11:05:02 +02:00
Laurent Destailleur
ef7de86d7e Show more param on conf.php file 2012-09-05 10:38:48 +02:00
Regis Houssin
1933bd4b50 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-09-05 10:17:33 +02:00
Regis Houssin
6bd571b31a New: add hook 'getDirList' in dol_dir_list() method 2012-09-05 10:17:02 +02:00
Laurent Destailleur
92fb64d112 Fix: PHP 5.2 compatibility 2012-09-05 10:11:18 +02:00
Laurent Destailleur
d57ba942f4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-09-05 09:59:03 +02:00
Laurent Destailleur
cc38fbe33f Uniformize code 2012-09-05 09:58:35 +02:00
Laurent Destailleur
f9607037a7 Qual: Removed deprecated table 2012-09-05 09:58:09 +02:00
Regis Houssin
f056ca3a41 FIXME: class commonagenda not exist 2012-09-05 08:07:15 +02:00
Laurent Destailleur
105cb2373c Add comment 2012-09-05 04:13:31 +02:00
Laurent Destailleur
e441b246a8 Debug of holiday module 2012-09-05 03:57:26 +02:00
Laurent Destailleur
246f3b5bb8 New: Add the holiday module (provided by teclib with permission to add 
it by default).
 2012-09-05 03:26:57 +02:00
Laurent Destailleur
55a5d56ebb Fix: comment 2012-09-04 23:08:57 +02:00
Laurent Destailleur
2f680adbb5 Fix: We must use the shipping address. 2012-09-04 23:03:39 +02:00
Regis Houssin
8a50a391be Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-09-04 20:47:03 +02:00
Regis Houssin
678e006121 Fix: for test 2012-09-04 20:46:08 +02:00
Laurent Destailleur
95fc429743 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2012-09-04 20:05:31 +02:00
Laurent Destailleur
aea89389e8 Qual: Uniformize pdf templates 
Qual: Removed duplicate pdf templates when content with no technology
difference nor functionnal difference
 2012-09-04 20:04:38 +02:00
Regis Houssin
58a9dc1afb Fix: syntax error 2012-09-04 19:33:11 +02:00
Regis Houssin
32421ef33c Fix: more simple 2012-09-04 19:25:31 +02:00
Regis Houssin
db9fe97738 New: add "please be patient" message 2012-09-04 19:19:30 +02:00
Regis Houssin
75166db2ed Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-09-04 18:35:03 +02:00
Regis Houssin
1b238a7086 Fix: try to use jquery blockUI 2012-09-04 18:34:36 +02:00
Laurent Destailleur
2bf933fbab Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2012-09-04 17:48:33 +02:00
Laurent Destailleur
dcc6b5e2c1 Qual: Removed deprecated files 2012-09-04 17:44:23 +02:00
Regis Houssin
83b5860ee1 Fix: for use with command line 2012-09-04 12:27:43 +02:00
Regis Houssin
65263886f4 Fix: add distinct for avoid double record 2012-09-04 11:51:51 +02:00
Regis Houssin
795bb1de77 Fix: comaptibility with multicompany and transverse mode 2012-09-04 11:09:17 +02:00
Regis Houssin
7f6bf34362 Try to use blockUI 2012-09-04 09:38:38 +02:00
Regis Houssin
2130571712 New: try jquery blockUI plugin 2012-09-03 22:05:13 +02:00
Regis Houssin
15db85bc86 Fix: prepare external extended ged 2012-09-03 21:00:46 +02:00
Laurent Destailleur
bfc933df4d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-09-03 18:18:12 +02:00
Laurent Destailleur
841586b050 Removed dead code. Allow to use attachment=0. 2012-09-03 18:17:19 +02:00
Regis Houssin
5622d1624c New: prepare for extend GED module 2012-09-03 18:03:39 +02:00
Laurent Destailleur
ac02450200 New: Can also use attachment=0 as parameter (for test purpose) 2012-09-03 18:01:07 +02:00
Regis Houssin
0797ff3057 Fix: missing concat 2012-09-03 17:25:35 +02:00
Regis Houssin
1abc87f642 Fix: can delete an import file with dialog confirm 2012-09-03 17:14:33 +02:00
Regis Houssin
fc29e7c432 Fix: $attachement is already true by default 
Fix: remove deprecated code
 2012-09-03 17:01:03 +02:00
Regis Houssin
14b1b1d6e5 Fix: missing upgrade with minor version 2012-09-03 16:28:55 +02:00
Regis Houssin
616ee24683 Fix: try to use another popup jquery plugin gpl compatible 2012-09-03 11:45:01 +02:00
Laurent Destailleur
36571f1d54 Removed dead code 2012-09-03 10:39:21 +02:00
Laurent Destailleur
51ea3c0775 Minor look fix 2012-09-03 10:27:31 +02:00
Laurent Destailleur
9eb21c3d9f Fix: Minot miscellanous fix 2012-09-03 10:17:58 +02:00
Laurent Destailleur
fdf787fca4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-09-03 09:45:44 +02:00
Laurent Destailleur
ac5cb23c04 Fix: Parameters at wrong place. 2012-09-03 09:45:26 +02:00
Regis Houssin
d2ae90f938 Fix: strict mode everywhere 2012-09-02 22:48:52 +02:00
Regis Houssin
8a5fe809f4 Fix: remove deprecated function and avoid warnings 2012-09-02 22:31:25 +02:00
Regis Houssin
e36af3085a New: add possibility to have a confirm dialog box with on/off buttons 
Qual: move some functions in lib_head.js
 2012-09-02 22:18:06 +02:00
Regis Houssin
0a88287b50 Fix: strict mode circus 2012-09-02 22:16:57 +02:00
Regis Houssin
7e5971f2d1 Fix: missing conf max_file_size 2012-09-02 22:15:18 +02:00
Regis Houssin
3659887134 Fix: add list of files 2012-09-02 22:15:00 +02:00
Regis Houssin
afdab32bbf Fix: avoid warnings (strict mode) 2012-09-02 22:12:56 +02:00
Regis Houssin
a00205a17d New: add possibility to set and del anothers constants 2012-09-02 22:06:03 +02:00
Regis Houssin
b9ac974013 Fix: use ajax button on/off 2012-09-02 22:04:30 +02:00
Regis Houssin
026cf124af Fix: avoid php warning 2012-09-02 22:01:05 +02:00
Regis Houssin
0ad137e734 Fix: uniformize code 2012-09-02 22:00:14 +02:00
Regis Houssin
00e0649cde Fix: strict mode plaza 2012-09-02 21:58:55 +02:00
Laurent Destailleur
2927a58606 Fix: Some fix into ajax ecm. 
New: The cache for nb of files into a dir is now implemented. By
default it is "not defined" and we refresh it when making a scan of a
dir for all subdirs.
 2012-09-02 20:11:36 +02:00
Laurent Destailleur
913b923886 Fix: error report when duplicate product 2012-09-02 15:09:48 +02:00
Laurent Destailleur
f369c9d99b New: ECM autodir works also for files joined to products and services 2012-09-02 15:03:55 +02:00
Laurent Destailleur
7f40fe18a4 Works on larger screens 2012-09-02 14:43:57 +02:00
Laurent Destailleur
f783960f19 Fix: Avoid repeat of img 2012-09-02 14:32:56 +02:00
Laurent Destailleur
c2dc2ba115 Fix: percentage during creation 2012-09-02 14:26:40 +02:00
Laurent Destailleur
c68ffdfcae Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-09-02 14:11:28 +02:00
Laurent Destailleur
1253683b83 Fix: edit of percentage 2012-09-02 14:11:07 +02:00
Laurent Destailleur
b891975b7d Fix: edit of percentage 2012-09-02 14:10:51 +02:00
Regis Houssin
ac5e201829 Fix: compatibility between bureau2crea theme and multicompany module 2012-09-02 11:40:20 +02:00
Regis Houssin
63564f8d50 Fix: broken features 2012-09-02 09:27:06 +02:00
Regis Houssin
671006316a Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-09-02 09:02:16 +02:00
Regis Houssin
9813344346 Fix: broken features and uniformize code 2012-09-02 08:50:42 +02:00
Laurent Destailleur
1ccb8f3363 New: Add a test during upgrade if database version is too low. 2012-09-02 01:47:21 +02:00
Regis Houssin
6f8b63f0ef Merge pull request #367 from simnandez/develop 
Fix: Bad assignation of const for pdf delivery module name
 2012-09-01 09:48:57 -07:00
Regis Houssin
7ff475c462 Fix: Modify spanish VAT to new rates (Juanjo) 2012-09-01 18:43:51 +02:00
Regis Houssin
54acdc71f6 Fix: this field is for 3.3 2012-09-01 18:09:47 +02:00
simnandez
44a3db8785 Fix: Bad assignation of const for pdf delivery module name 2012-09-01 17:02:38 +02:00
Laurent Destailleur
c5dea16e31 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-09-01 14:34:40 +02:00
Grand Philippe
56a620bc88 fix: wrong link 2012-08-31 19:07:47 +02:00
Laurent Destailleur
f64e6ced25 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-08-31 18:38:35 +02:00
Laurent Destailleur
9c13f81bef Trans 2012-08-31 18:38:01 +02:00
Regis Houssin
c9886fb86d Fix: same size of view lines 2012-08-31 16:50:46 +02:00
Laurent Destailleur
83ab8c05e2 New: More surface control into project edition 2012-08-31 14:31:36 +02:00
Laurent Destailleur
6709d3d377 Fix: moving date of task when moving date of project was not working 2012-08-31 14:31:08 +02:00
Laurent Destailleur
27846d1698 Fix: Start and end date not saved at project creation 
Conflicts:
	htdocs/projet/class/project.class.php
 2012-08-31 12:55:10 +02:00
Regis Houssin
f81b696890 Fix: code optimization 2012-08-31 09:25:27 +02:00
Regis Houssin
18b7549c52 Fix: use GETPOST('usenewaddlineform') instead MAIN_FEATURES_LEVEL 2012-08-31 08:51:08 +02:00
Regis Houssin
4054e5a8bd Merge pull request #364 from marcosgdf/minor 
Fixed a problem when adding line into proposal
 2012-08-30 23:36:36 -07:00
Regis Houssin
57fa5d6c03 Merge pull request #363 from marcosgdf/translations 
Fixed es_ES translation typo
 2012-08-30 23:33:38 -07:00
Marcos García
bb99e4d40d Fixed a problem when adding line into proposal 2012-08-31 07:49:00 +02:00
Marcos García
2b63ea314c Fixed es_ES translation typo 2012-08-31 07:16:39 +02:00
Marcos García
4209898d20 Lower-cased Header function 2012-08-31 05:58:38 +02:00
Laurent Destailleur
2aa883c25e Better comments 2012-08-31 01:00:18 +02:00
Regis Houssin
9a6ddbe096 Fix: use $mysoc instead customer 2012-08-30 22:14:18 +02:00
Regis Houssin
e84f57e62c Fix: restore broken features 2012-08-30 21:37:37 +02:00
Laurent Destailleur
c7e7b67433 Fix: bad default vat calculation 2012-08-30 21:16:41 +02:00
Laurent Destailleur
cd9a6942ce Revert "Fix: add title" 
This reverts commit f27821a657.
 2012-08-30 20:28:43 +02:00
Regis Houssin
f27821a657 Fix: add title 2012-08-30 19:32:34 +02:00
Regis Houssin
8f21abfc5a Fix: Disabled if customer is not subject to VAT 2012-08-30 19:01:48 +02:00
Laurent Destailleur
96e0586934 Fix: enhance cleaning of database 2012-08-30 17:11:42 +02:00
Laurent Destailleur
ddb31d4b2c Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/webservices/server_user.php
 2012-08-30 16:54:59 +02:00
Regis Houssin
88742e41d4 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-08-30 11:10:53 +02:00
Regis Houssin
95c2650160 Fix: best method 2012-08-30 11:10:17 +02:00
Laurent Destailleur
bd5acde0c7 Add tag to detect new method (to help debugs) 2012-08-29 19:03:58 +02:00
Laurent Destailleur
edab47fbc8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-08-29 18:23:49 +02:00
Regis Houssin
ffd6c07003 Fix: remove obsolete code 2012-08-29 18:14:20 +02:00
Regis Houssin
13d46da3fe Fix: clear old data before update 2012-08-29 18:01:00 +02:00
Laurent Destailleur
86a12d7471 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-08-29 17:43:43 +02:00
Laurent Destailleur
d8d28d6350 New: Add ChromePHP output into syslog module. 2012-08-29 17:43:20 +02:00
Regis Houssin
327e51ccd9 Fix: more simple 2012-08-29 17:40:13 +02:00
Regis Houssin
4a97ea9b7b Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-08-29 17:30:11 +02:00
Laurent Destailleur
21555f00ef Fix: Bad test 2012-08-29 16:59:36 +02:00
Regis Houssin
d6918d7a87 Fix: upgrade ckeditor 2012-08-29 16:31:48 +02:00
Laurent Destailleur
87742cb3d8 Qual: Move an admin tools into admin menu. 
Fix: Fix 7 bugs into the mass vat update tool.
 2012-08-29 14:13:13 +02:00
Regis Houssin
6bdba9fa72 Fix: get the good vat rates 2012-08-29 11:55:53 +02:00
Laurent Destailleur
07aae3200f Fix: Test on ref and ref_ext into webservice 2012-08-29 10:23:15 +02:00
Regis Houssin
5f32617843 Fix: restore dolibarr parameters 2012-08-29 10:14:40 +02:00
Regis Houssin
4da73a8d82 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-08-29 10:08:46 +02:00
Regis Houssin
54860ef304 Fix: upgrade tcpdf and fpdi 2012-08-29 09:55:32 +02:00
Laurent Destailleur
e027f12e0a Merge pull request #359 from marcosgdf/minor 
Uniformized SQL error management in boxes
 2012-08-29 00:45:27 -07:00
Laurent Destailleur
d710de5e64 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-08-29 09:43:45 +02:00
Laurent Destailleur
3771ad2e87 Fix: Restore line feed after removing it from select_product function. 2012-08-29 09:43:24 +02:00
Marcos García
89692fb79e Uniformized sql error management 
Eldy told me that this is the correct way to handle SQL errors…
 2012-08-29 08:37:12 +02:00
Regis Houssin
70c467e429 Fix: Update vat rate combobox 2012-08-29 08:17:25 +02:00
Regis Houssin
3cb93e90cd Merge pull request #358 from marcosgdf/translations 
Improved translations
 2012-08-28 22:22:00 -07:00
Marcos García
f9eb3873b0 Improved and added missing es_ES translations 2012-08-29 00:32:57 +02:00
Marcos García
1a676b5b4b Added missing permission translations 2012-08-29 00:32:16 +02:00
Marcos García
7c0463b215 Used incorrect translation keys 
Duplicated keys
 2012-08-29 00:29:47 +02:00
Laurent Destailleur
e3e36dca6d We set to zero to unifrmize way of working between customer and supplier 
payments
 2012-08-28 23:39:11 +02:00
Laurent Destailleur
8a74c928f3 Fix: regression 2012-08-28 23:01:04 +02:00
Laurent Destailleur
745b35f94e Missing translation key 2012-08-28 22:39:22 +02:00
Laurent Destailleur
6853ed0e5e Fix: permission for a user to view its own card using webservice 2012-08-28 22:31:51 +02:00
Laurent Destailleur
bd05056616 Fix: Missing br removed from select_produits 2012-08-28 22:25:58 +02:00
Laurent Destailleur
32ca894952 Try a fix for js syntax error 2012-08-28 22:05:40 +02:00
Laurent Destailleur
990a13146d Fix: permission for a user to view its own card using webservice 2012-08-28 18:47:32 +02:00
Laurent Destailleur
4108e48d5c Merge pull request #349 from FHenry/develop 
Change size of element type
 2012-08-28 09:25:08 -07:00
Laurent Destailleur
2a800816d9 Merge pull request #356 from cbattarel/develop 
modify margin management for global discount + correct bug (wrong consta...
 2012-08-28 09:24:06 -07:00
Laurent Destailleur
4bd6e9e6ad Merge pull request #355 from marcosgdf/cerfafr 
Minor fixes to CerfaFR donation document
 2012-08-28 09:09:29 -07:00
Regis Houssin
4bb837dc6a Fix: update icon 2012-08-28 17:01:16 +02:00
Regis Houssin
c0bde33b1f Fix: [ task #498 ] add same tests in edit mode 2012-08-28 16:11:40 +02:00
Regis Houssin
62a7847c5b Fix: [ task #498 ] debug 2012-08-28 15:35:32 +02:00
Regis Houssin
ce9a16b341 Fix: button add not disabled 2012-08-28 14:42:46 +02:00
Regis Houssin
526f0e310b Fix: convert line delimiters 2012-08-28 12:38:07 +02:00
Regis Houssin
06b4cc3724 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-08-28 12:37:06 +02:00
Regis Houssin
4332c341bf Fix: check if textarea is not empty for free lines 2012-08-28 12:36:35 +02:00
Christophe Battarel
c1859d361a modify margin management for global discount + correct bug (wrong constant name) 2012-08-28 10:13:58 +02:00
Marcos García
c8869e65a6 Minor fixes to CerfaFR donation document 
* Title wasn't localized
* Fixed donation ref
 2012-08-28 09:58:15 +02:00
Laurent Destailleur
562e2b6a7b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-08-28 09:33:58 +02:00
Laurent Destailleur
26b05212c7 Fix: Missing include 2012-08-28 09:33:43 +02:00
Regis Houssin
57f5338e4f Merge pull request #353 from marcosgdf/coding-style 
Refactored Mailmanspip class
 2012-08-27 22:55:18 -07:00
Marcos García
c302567d1d Refactored Mailmanspip class 
Removed duplicated code
Added missing error tests and logs
 2012-08-28 07:02:00 +02:00
Marcos García
afee791b35 Forgot to add the copyright 2012-08-28 05:53:44 +02:00
Marcos García
c6fe6c32bc Translated some MailmanSPIP strings 2012-08-28 05:46:48 +02:00
Marcos García
f64ab52993 Fixed MailmanSPIP problem + little refactor 2012-08-28 05:22:39 +02:00
Regis Houssin
eea7127aa2 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-08-27 21:45:48 +02:00
Regis Houssin
e55c86074e Fix: compatibility with combobox 2012-08-27 21:45:19 +02:00
Laurent Destailleur
24c29e23f9 Fix: Force reload of index page when all boxes were removed. This is to 
be sure to have the combo list complete after this refresh.
 2012-08-27 21:16:26 +02:00
Laurent Destailleur
857a11f508 New: Can select thirdparties into emailing targets, even if module 
category is not enabled.
 2012-08-27 20:21:53 +02:00
Laurent Destailleur
80d9fb7134 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-08-27 20:02:42 +02:00
Laurent Destailleur
d0d5891eef New: Add unit foot2, inch2, foot3 and inch3 for surface and volumes. 2012-08-27 20:02:23 +02:00
Laurent Destailleur
6c0dac2f17 More things to repair 2012-08-27 19:30:09 +02:00
Regis Houssin
10f9b53557 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-08-27 19:12:31 +02:00
Regis Houssin
3e2be54ead Fix: restore old method 2012-08-27 19:11:44 +02:00
Laurent Destailleur
29fa8b64c4 Checkstyle 2012-08-27 18:04:00 +02:00
Laurent Destailleur
8a42cc26b7 Fix: Bad syntax of class name 2012-08-27 18:00:59 +02:00
Regis Houssin
7ca0aa8a78 Fix: restore deprecated files 2012-08-27 17:23:35 +02:00
Regis Houssin
07a10d3984 Fix: add compatibility with old static combobox 2012-08-27 17:18:46 +02:00
Laurent Destailleur
426b3c2627 New: Adding a box add it on column with the less boxes. 2012-08-27 14:47:20 +02:00
Laurent Destailleur
b57de4fbac Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-08-27 14:11:58 +02:00
Laurent Destailleur
1255699791 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/core/tpl/objectline_add.tpl.php
 2012-08-27 14:11:17 +02:00
Regis Houssin
6426ef3f8d Fix: add test for instance 2012-08-27 14:08:59 +02:00
Laurent Destailleur
625f53a708 Fix 4: test on selected value was lenght > 0 but if value is 0, lenght 
is 1 and we want flase here.
Fix 5: Button Add is enabled once a predefined product is selected.
 2012-08-27 13:54:14 +02:00
Regis Houssin
fb866d9106 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git 
into develop

Conflicts:
	htdocs/core/lib/ajax.lib.php
	htdocs/core/tpl/objectline_add.tpl.php
 2012-08-27 13:33:31 +02:00
Regis Houssin
2f14fbe791 Fix: debug ckeditor and VAT 2012-08-27 13:27:27 +02:00
Laurent Destailleur
cc22f25d97 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-08-27 13:07:40 +02:00
Laurent Destailleur
0bdb9aac31 Fix condition of usage of ckeditor 2012-08-27 13:07:25 +02:00
Laurent Destailleur
9570e03b1e Qual: Add TODO 2012-08-27 12:07:50 +02:00
Marcos García
7be72c39b1 Fixed SQL problems with llx_accounting.sql 2012-08-27 03:17:57 +02:00
Marcos García
07070b238b Fixed SQL syntax problem 2012-08-27 02:41:49 +02:00
Laurent Destailleur
35a0311d28 Fix: Checkstyle 2012-08-26 23:15:26 +02:00
Laurent Destailleur
0b42251dfd Checkstyle 2012-08-26 23:13:18 +02:00
Laurent Destailleur
d8e162c309 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-08-26 22:36:21 +02:00
Laurent Destailleur
bdaaa1d038 New: [ task #494 ] Send an email to foundation when a new member has 
auto-subscribed
 2012-08-26 22:33:27 +02:00
FHenry
d716763896 change size of elementtype 2012-08-26 21:53:40 +02:00
Regis Houssin
efa471b12b Fix: test if ckeditor is enabled 2012-08-26 21:47:56 +02:00
Laurent Destailleur
7fa4b9b423 Fix: Clean feature [ task #515 ] Add a "no e-mail" checkbox on contact 2012-08-26 20:28:19 +02:00
Laurent Destailleur
b2808f6a60 Doxygen 2012-08-26 20:18:29 +02:00