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

3270 Commits

Author SHA1 Message Date
Christophe Battarel
b9cdde88c7 show localtaxes on einstein pdf model 2012-11-28 10:43:21 +01:00
Christophe Battarel
f00b4b5527 correction to allow global local tax (type 7) on localtax1 2012-11-28 10:24:40 +01:00
Laurent Destailleur
65110ead88 Merge pull request #496 from FHenry/develop 
Update Common Object update_contact method to allow to change the
 2012-11-27 11:32:53 -08:00
fhenry
5c94912e66 Add datehourpicker in editfieldval method to allow display of hour 2012-11-27 18:35:51 +01:00
simnandez
8dc0aec754 [ task #204 ] Manage canadian, spain and other country double VAT with a 
generic system. Add spanish tests
 2012-11-27 16:52:52 +01:00
Christophe Battarel
203a03c4d1 show local taxes on pdf propale azur model 2012-11-27 15:56:45 +01:00
Christophe Battarel
46089bb03c also update ttc with global local taxes 2012-11-27 15:43:52 +01:00
Christophe Battarel
e87bb02323 retrieve global local taxes in update_price function 2012-11-27 15:34:46 +01:00
Christophe Battarel
9f03b56348 dont put global local tax on lines 2012-11-27 15:33:11 +01:00
fhenry
f456a4d0fe Update Common Object update_contact method to allow to change the 
fk_socppoeple linked
 2012-11-27 15:26:14 +01:00
Laurent Destailleur
49730ac24f Code comments only 2012-11-27 13:58:06 +01:00
Laurent Destailleur
c9edac9cd6 Try to fix differently pb of change/keyup because current change has a 
regression (no way to use ajax select onto supplier orders when using
keybord or mouse selection).
 2012-11-26 13:33:18 +01:00
Laurent Destailleur
d9fb0c941b Qual: remove select to have id same with combo and ajax 2012-11-26 13:28:02 +01:00
Laurent Destailleur
641f4b1ecc Qual: Change to unformize returns of hooks. 2012-11-26 13:26:50 +01:00
Laurent Destailleur
4480af348c Fix: Cols at wrong place 2012-11-26 11:57:20 +01:00
Laurent Destailleur
b4ebd7e852 Qual: Uniformize code and fix a regression 2012-11-26 11:36:45 +01:00
Maxime Kohlhaas
437d082308 Fix : multicompany comptability 2012-11-24 00:06:54 +01:00
Maxime Kohlhaas
9e4cba13c8 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko559 
Conflicts:
	htdocs/install/mysql/migration/3.2.0-3.3.0.sql
 2012-11-22 15:24:10 +01:00
Laurent Destailleur
e76ef823b8 New: Add a tab into members statistics to count members by nature. 2012-11-21 23:01:36 +01:00
Laurent Destailleur
59a305f6f1 New: no dash line if last item. 2012-11-21 20:35:51 +01:00
Laurent Destailleur
1f263943c5 New: Add option to add slashes lines between lines into PDF. 2012-11-21 19:07:03 +01:00
Laurent Destailleur
c0c13b862a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-11-21 14:45:33 +01:00
Laurent Destailleur
af637c8afb Qual: Removed "dolibarr" into default email sender. 2012-11-21 14:45:02 +01:00
Laurent Destailleur
d9cdb542d5 Debug filter during export 2012-11-20 14:07:52 +01:00
Laurent Destailleur
ddb3cf6f42 Fix: Debug holiday module 2012-11-20 13:14:16 +01:00
Laurent Destailleur
a62583e987 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2012-11-20 12:33:24 +01:00
Laurent Destailleur
2d000b5df8 Fix: The default select choice was not selected when using jquery dialog 
confirm boxes.
 2012-11-20 12:23:32 +01:00
Regis Houssin
2d5368e135 Fix: converting line delimiters 2012-11-20 12:11:19 +01:00
Regis Houssin
a3d9b5788c Fix: use keyup instead change to avoid loosing the product id 
Fix: strict mode
 2012-11-20 12:09:52 +01:00
Laurent Destailleur
e53f6a383d Fix: Removed a hard coded error code. 2012-11-20 11:23:34 +01:00
Laurent Destailleur
0fb126a7e3 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2012-11-19 17:30:57 +01:00
Laurent Destailleur
3b861598a7 Doc 2012-11-19 17:29:57 +01:00
simnandez
3fe79b379d Fix: Bad calculation of localtax amount calculation if type of 
localtaxes are 1 3 or 5. Researched by Eldy
 2012-11-19 17:10:28 +01:00
Maxime Kohlhaas
ec37a5e005 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko559 2012-11-19 13:31:23 +01:00
Laurent Destailleur
6512fd90a9 New: Can export customer shipments. 2012-11-18 15:24:01 +01:00
Laurent Destailleur
e0de91144a Merge pull request #484 from simnandez/develop 
Fix: Local taxes. If buyer not subject to localtax no need make database
 2012-11-18 03:11:37 -08:00
Laurent Destailleur
19b7cc66d5 Qual: Remove hidden option so is not efficient and not used files. 
Qual: Uniformize code
 2012-11-17 11:48:51 +01:00
Laurent Destailleur
61ed6e10e1 Uniformize code 2012-11-16 18:59:03 +01:00
simnandez
5515f15187 Fix: Localtaxes rules for spain 2012-11-16 16:23:51 +01:00
Laurent Destailleur
2e8e1f759f New: Add warning when we try to load sql from an not existing dir 2012-11-16 13:25:49 +01:00
simnandez
b7f38def61 Fix: Local taxes. If buyer not subject to localtax no need make database 
access
 2012-11-16 12:13:29 +01:00
Laurent Destailleur
511a75b5de Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-11-14 18:59:07 +01:00
Laurent Destailleur
4c4eeaac2a Fix: Test fails if value is 0 2012-11-14 18:56:47 +01:00
Laurent Destailleur
768e719961 Fix: firstname was missing 2012-11-14 18:32:52 +01:00
Regis Houssin
8908f977b8 Fix: converting line delimiters !!! 2012-11-14 11:31:08 +01:00
Maxime Kohlhaas
667c8cffae Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko559 2012-11-14 11:02:35 +01:00
Laurent Destailleur
5e583b65f2 Doxygen 2012-11-14 01:35:39 +01:00
Laurent Destailleur
3dd9d20d53 Add alternative picto for rendez-vous. 2012-11-14 00:59:52 +01:00
Laurent Destailleur
06c77576b7 New: Maxi debug on feature to filter lines on export. Removed a lot of 
bugs but I had to change a lot of thing to fix this. There is still
work to now save filters in session.
 2012-11-14 00:27:25 +01:00
Laurent Destailleur
22d1847250 Fix: Option MAIN_MAIL_SENDMAIL_FORCE_BA and MAIN_FIX_BUGGED_MTA was not 
complete.
 2012-11-13 17:25:47 +01:00
Regis Houssin
4ec1d376bf Fix: strict mode journey 2012-11-13 09:02:21 +01:00
Regis Houssin
5faa7fb075 Fix: for module name with number 2012-11-12 19:09:53 +01:00
Laurent Destailleur
124366f41a Fix: To be compatible with LDAP synchro, property oldcopy must be set. 
We add a warning if not.
 2012-11-11 23:31:45 +01:00
Laurent Destailleur
66755fb166 Fix: Avoid confusion between method getXXX into parent class with 
method getXXX into child class. They are not inheritance, so i renamed
method of parent into getXXXForKey.
 2012-11-11 18:11:10 +01:00
Laurent Destailleur
842982f134 Doxygen 2012-11-11 17:50:24 +01:00
Regis Houssin
2240dd4ac6 Fix: missing tinyint 2012-11-11 15:12:42 +01:00
Maxime Kohlhaas
332c077d77 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko559 2012-11-09 13:46:50 +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
f37c559235 Fix: regression 2012-11-06 19:23:23 +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
Regis Houssin
1722db223a Fix: add timepicker default options 2012-11-03 20:41:59 +01:00
Laurent Destailleur
0f2dac163f Fix: Bad label when validating/paying an invoice from POS module 2012-11-03 16:58:07 +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
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
d3491e9ac0 Fix: Colors must be set into CSS. 2012-11-03 11:55:39 +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
f8a9733b73 Again 2 pixels missings 2012-11-03 00:37:10 +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
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
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
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
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
Maxime Kohlhaas
fa46923b3e Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko559 2012-10-30 08:06:29 +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
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
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
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
c521a77e92 New: add key generator in webservices admin page 2012-10-26 15:20:47 +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
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
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
9d95e8bffb Fix: missing hookmanager 2012-10-25 11:44:04 +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
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
0d92fe2de1 Normalize code 2012-10-24 17:32:10 +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
fhenry
597ba3e6fc [ task #581 ] Implement function DDLInfoTable for PostgreSQL db class 2012-10-24 11:37:00 +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
1999452701 Fix: Avoid warnings 2012-10-23 23:49:16 +02:00
Regis Houssin
30430953de Fix: missing row and col parameters 2012-10-23 09:33:07 +02:00
Laurent Destailleur
9589b84a1a Fix: No reason to start content of a cell with br 2012-10-22 19:30:49 +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
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
6329344df2 Fix: broken features 
Fix: use entity O for all entities
 2012-10-22 09:15:08 +02:00
Laurent Destailleur
d56791d4dc Fix: Works with PHP 5.2 2012-10-22 00:43:59 +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
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
ffa1b10061 doxygen 2012-10-19 14:45:00 +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
97001951e6 New: Add field stock into product export 2012-10-17 20:32:57 +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
ef1e735ff9 Fix: doxygen 2012-10-17 17:19:28 +02:00
Laurent Destailleur
4d5a6c6f01 Typo error 2012-10-17 15:07:13 +02:00
Laurent Destailleur
01bd20147e Fix: Some fixes and enhancement into modularizing log functions 2012-10-17 14:46:20 +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
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
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
Laurent Destailleur
5dff8dbc6d New: Avoid horizontal scroll on standard resolution. 2012-10-15 23:13:28 +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
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
Regis Houssin
df1e4a401a Fix: convert line delimiters 
Info: the last Eclipse version fix this problem
 2012-10-13 11:42:58 +02:00
Laurent Destailleur
6046feda11 Restore border into PDF 2012-10-11 09:42:47 +02:00
Regis Houssin
10bd942328 Fix: customer ref is very important for a best traceability 2012-10-10 12:04:08 +02:00
Laurent Destailleur
8b4886073c Fix: Removed the FIXME. This is supported by the pgsql driver. 2012-10-09 12:03:39 +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
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
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
04be578863 fix wrong last update in cleansep function 2012-10-08 11:32:28 +02:00
Laurent Destailleur
215d7a883e Fix: Revert bugged new feature that show false information. 2012-10-06 23:13:46 +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
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
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
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
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
2159848490 Fix: getTradFromKey 2012-10-03 17:47:53 +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
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
c25e908b75 Doxygen 2012-10-03 00:30:50 +02:00
Maxime Kohlhaas
89e14043a1 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko186 2012-10-02 11:01:21 +02:00
Spangaro Alexandre
3ae6117e16 Reintegrate accounting.php in admin 2012-10-02 06:07:57 +02:00
Spangaro Alexandre
3e4fd761a5 Add function to choose chart of accounts 2012-10-02 05:45:49 +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
Maxime Kohlhaas
1aa3156958 Task # 186 : new box of products with stock alert 2012-10-01 16:44:38 +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
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
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
Christophe Battarel
15d7266abf import : add csv options (separator and enclosure) 2012-09-28 10:23:04 +02:00
Laurent Destailleur
6c769cfaf3 Fix: postgresql compatibility 
Qual: Removed deprecated code
 2012-09-27 23:54:47 +02:00
Laurent Destailleur
e94ddde91d Fix: Patch calculation field odt 2012-09-27 21:08:32 +02:00
Laurent Destailleur
a98de7ef02 Fix: No error when hour not provided 2012-09-27 13:25:31 +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
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
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
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
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
c268a62cab Fix: try to disable 1900 test 2012-09-24 09:30:37 +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
Regis Houssin
d147c360d3 FIXME: this code is useless, $yearoffset is 0 by default 2012-09-23 17:05:08 +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
Laurent Destailleur
9bbe0e6b1c Qual: Mutuamize codeby using tpl. 
New: Support unique field for extrafields
 2012-09-22 20:27:06 +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
6151bc3a42 Fix: more simple 2012-09-22 09:18:36 +02: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
Regis Houssin
ba1b282c3b Fix: remove unused code 2012-09-21 11:28:28 +02:00
Regis Houssin
50b0dcf47e New: try to use new tag 2012-09-21 11:23:31 +02:00
Laurent Destailleur
5e9cd37107 Uniformise look of PHP Info page. 2012-09-21 00:13:20 +02:00
Laurent Destailleur
408a4553ee Help center at end (because we leave software) 2012-09-20 22:54:05 +02:00
Laurent Destailleur
05e20b8f30 New: Can exclude some type of events 2012-09-20 00:42:51 +02:00
Regis Houssin
d58c106f66 Fix: convert line delimiters !!! 2012-09-19 17:53:09 +02:00
Regis Houssin
98b38628c5 Fix: optimizing 2012-09-19 17:24:40 +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
Laurent Destailleur
8b7342f0ea New: Project notes use the note.tpl templates 2012-09-19 16:03:17 +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
0e76bd7ac6 Fix: Blank page when renaming a product ref 2012-09-19 14:11:01 +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
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
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
Laurent Destailleur
889f71db6f Fix: Color of lines must be set for each lines 2012-09-18 12:52:54 +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
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
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
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
07fa800360 Fix: Correct concat when mixing not html and html descriptions 2012-09-16 20:23:57 +02:00