Commit Graph

986 Commits

Author SHA1 Message Date
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
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
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
Laurent Destailleur
5e583b65f2 Doxygen 2012-11-14 01:35:39 +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
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
Laurent Destailleur
7d01ea7fc3 Fix: Do not break dolibarr usage if log fails 2012-11-06 19:42:03 +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
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
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
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
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
Laurent Destailleur
64d8d558a5 Qual: Uniformize pdf code 2012-10-31 02:29:45 +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
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
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
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
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
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
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
daeb1029a1 New: Support field required or not 2012-10-25 13:11:55 +02:00
Regis Houssin
9d95e8bffb Fix: missing hookmanager 2012-10-25 11:44:04 +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
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
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
eaad5f075e Fix: Some fix to removed refused controls by distrib package build
systems.
2012-10-22 13:08:55 +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
simnandez
aa53b7a2ba New: More import options. Thirds Bank Accounts 2012-10-19 13:00:53 +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
Laurent Destailleur
97001951e6 New: Add field stock into product export 2012-10-17 20:32:57 +02:00
simnandez
d7dcd3c14b New: More import options. Supplier Products 2012-10-17 19:02:12 +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
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
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
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
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
simnandez
6f799f8e16 New: More import options. Warehouses 2012-10-13 18:02:43 +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
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
Christophe Battarel
04be578863 fix wrong last update in cleansep function 2012-10-08 11:32:28 +02:00
Laurent Destailleur
bdb7becbc6 Fix: Try another fix on getTrad bug. 2012-10-04 09:44:04 +02:00
Laurent Destailleur
c25e908b75 Doxygen 2012-10-03 00:30:50 +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
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
Regis Houssin
1919604089 Fix: more compatible with multicompany transverse mode
Fix: strict mode bubbles
2012-09-27 11:57:46 +02:00
Regis Houssin
d58c106f66 Fix: convert line delimiters !!! 2012-09-19 17:53:09 +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
a68483d72f Uniformize code. 2012-09-19 14:49:13 +02:00
Laurent Destailleur
1347ecf14e Qual: Removed warnings 2012-09-19 12:49:58 +02:00
simnandez
dd9d3c8ba4 Fix: localtaxes must display in pdf even if they are in negative 2012-09-18 17:57:52 +02:00
Laurent Destailleur
889f71db6f Fix: Color of lines must be set for each lines 2012-09-18 12:52:54 +02:00
Regis Houssin
8bab5fdadd Fix: convert line delimiters 2012-09-17 19:37:02 +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
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
Laurent Destailleur
cd6a8fa761 New: Uniformize code 2012-09-17 02:07:14 +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
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
Regis Houssin
4220229573 Fix: minor change 2012-09-14 15:56:50 +02:00
Laurent Destailleur
46ee00fc5e A party to fish bugs and merou. 2012-09-13 18:28:03 +02:00
Marcos García
cb4044755b Fixed export translations
Added missing strings
Corrected some translations
2012-09-12 19:11:03 +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
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
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
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
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
84438d82f4 Qual: Clean module 2012-09-05 12:59:33 +02:00
Laurent Destailleur
b20c8d97c0 Fix: Checkstyle 2012-09-05 11:20:52 +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
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
15db85bc86 Fix: prepare external extended ged 2012-09-03 21:00:46 +02:00
Laurent Destailleur
9eb21c3d9f Fix: Minot miscellanous fix 2012-09-03 10:17:58 +02:00
Regis Houssin
d2ae90f938 Fix: strict mode everywhere 2012-09-02 22:48:52 +02:00
Regis Houssin
0a88287b50 Fix: strict mode circus 2012-09-02 22:16:57 +02:00
Regis Houssin
afdab32bbf Fix: avoid warnings (strict mode) 2012-09-02 22:12:56 +02:00
Regis Houssin
54860ef304 Fix: upgrade tcpdf and fpdi 2012-08-29 09:55:32 +02:00
Marcos García
7c0463b215 Used incorrect translation keys
Duplicated keys
2012-08-29 00:29:47 +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
857a11f508 New: Can select thirdparties into emailing targets, even if module
category is not enabled.
2012-08-27 20:21:53 +02:00
Regis Houssin
3e2be54ead Fix: restore old method 2012-08-27 19:11:44 +02:00
Laurent Destailleur
56d19437f4 Fix: [ bug #524 ] Donation receipt html_cerfafr is not localized 2012-08-26 18:01:29 +02:00
Regis Houssin
f322ec50ed New: [ task #498 ] - final part 2012-08-25 15:21:34 +02:00
Regis Houssin
954f2afbc5 Fix: remove obsolete code 2012-08-25 10:49:59 +02:00
Grand Philippe
2d34e7bf8b fix some issue within typhon pdf 2012-08-24 16:34:05 +02:00
Regis Houssin
4d1555f4ca Merge pull request #338 from atm-maxime/mko515
Mko515
2012-08-23 00:01:05 -07:00
Maxime Kohlhaas
39de1cb010 Task 515 : Correction on SQL request 2012-08-23 08:43:29 +02:00
Marcos García
9b3c89ac47 Removed parenthesis from all include and include_once and replaced with single quotes 2012-08-23 02:40:41 +02:00
Maxime Kohlhaas
5fd10d14be Task 515 : Corrections + target modules modifications 2012-08-23 00:00:01 +02:00
Marcos García
ea119c45a2 Lower-cased all <?PHP 2012-08-22 23:27:53 +02:00
Marcos García
706d79986c Removed parenthesis from all require_once and replaced with single quotes 2012-08-22 23:11:24 +02:00
Regis Houssin
4a5d89e6cc Fix: move barcode type entries in module descriptor for best
compatibility with multicompany
2012-08-22 17:44:52 +02:00
Regis Houssin
3991e0b13d Fix: add accountancy code error message 2012-08-20 01:29:13 +02:00
Regis Houssin
a856ad0afa Fix: strict mode sunshine 2012-08-19 09:05:50 +02:00
Regis Houssin
bd99c2d23d Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-08-18 08:31:59 +02:00
Regis Houssin
d03b29ba78 Fix: [ bug #502 ] Error when validating cheque deposit 2012-08-18 08:30:29 +02:00
Regis Houssin
09e34068bc Merge pull request #319 from marcosgdf/translations
A lot of improvements into translations
2012-08-17 22:22:56 -07:00
Regis Houssin
3438305169 FIXME: with ajax autocompleter, does not see the products that have no
supplier prices because they can be selected and it creates an error
message.
Fix: Do not make a "print" on "hook methods", just get the result
2012-08-17 15:16:07 +02:00
Regis Houssin
b3d09478ca Merge pull request #313 from lrq3000/develophooks
A lot of hooks and triggers implemented + custom substitution function for lines in ODT
2012-08-16 08:15:19 -07:00
Marcos García
f320ed92cc Translated and upper-cased export formats, improved es_ES translations
fr_FR exports translations were made by @fhenry and Manuel Pintor (contact@idl-mp.com)
Little refactor too
2012-08-16 13:07:12 +02:00
Marcos García
cc4d5ff8d8 Removed the use of duplicated key translations
Nature is now being used instead of MorPhy
UserTitle is now being used instead of Civility
VATIntraVeryShort was being used were not necessary
2012-08-15 18:55:32 +02:00
Regis Houssin
48efabc8a4 Fix: remove deprecated function and avoid warnings 2012-08-15 09:06:36 +02:00
Stephen L
c0a314000c Add custom ODT substitution for lines of products (completesubstitutionarray_lines)
Signed-off-by: Stephen L. <lrq3000@gmail.com>
2012-08-14 16:03:45 +02:00
Maxime Kohlhaas
44b84b2177 task # 326 : Add a numbering module to suggest automatically a product ref 2012-08-09 01:41:55 +02:00
Laurent Destailleur
0d346ac1c1 New: A module can add several css and several js.
New: Removed lightbox as it is not compatible with GPL.
2012-08-08 20:43:23 +02:00
Laurent Destailleur
54c6db5b81 Qual: Uniformize code for pdf generation.
Refactoring of pdf code to make code cleaner and fix a lot of bug into
page breaks.
2012-08-08 04:12:20 +02:00
Laurent Destailleur
49f8f07737 Start to work on bug [ bug #251 ] and [ bug #260 ]. 2012-08-06 19:22:14 +02:00
Regis Houssin
89cd23452f Fix: missing delete shipping and delivery files
(minimum for possibility to merge with 3.2)
2012-08-05 20:41:11 +02:00
Laurent Destailleur
591b029781 Doxygen 2012-08-05 15:15:58 +02:00
Regis Houssin
d6a4d5ef41 Fix: avoid errors if install directory is deleted before module
activation
2012-08-01 14:42:24 +02:00
Marcos García
3520513c6b Fixed an error that I introduced in a previous commit... 2012-07-31 00:53:05 +02:00
Laurent Destailleur
5772e46c9a We start new modules with level "experimental". 2012-07-30 22:18:54 +02:00
Regis Houssin
e44fd4885d Fix: change the last $DB to $db 2012-07-30 18:43:49 +02:00
Marcos García
5a73c32f46 Migrated ClassName to __construct() function
Changed $DB to $db
lower-cased "Class"
2012-07-30 17:17:33 +02:00
Marcos García
be388b4418 Fixed some typos in es_ES and en_US translations
Allowed MailmanSPIP module configuration to be translated into other languages
Moved MailmanSPIP-related strings to mailmanspip.lang file
2012-07-29 22:23:51 +02:00
Regis Houssin
251640561f Fix: strict mode happy hour 2012-07-28 12:35:11 +02:00
Regis Houssin
a157327859 Fix: strict mode paradise 2012-07-28 11:28:37 +02:00
Laurent Destailleur
1c557a96bd Prepare task 473 2012-07-27 19:26:54 +02:00
Laurent Destailleur
0b048ebb94 [ bug #40 ] Export de donnes dangereux 2012-07-27 16:03:20 +02:00
Laurent Destailleur
dce9b96260 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/core/lib/functions2.lib.php
	htdocs/install/lib/repair.lib.php
	htdocs/install/mysql/migration/3.2.0-3.3.0.sql
2012-07-25 12:20:45 +02:00
Regis Houssin
65e183c8c9 Merge pull request #258 from FHenry/develop
Develop
2012-07-24 09:15:36 -07:00
Laurent Destailleur
24c54ccaf1 Start to work on bug export 2012-07-24 16:19:46 +02:00
FHenry
8f2efa4879 Add syslog for debug 2012-07-24 14:25:21 +02:00
FHenry
3892c2ceca Usubscribe mailling module
- Correct indentation
2012-07-24 13:24:22 +02:00
Regis Houssin
fb23364511 Fix: uniformize code 2012-07-23 16:10:54 +02:00
Regis Houssin
01ab1aa66f Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git
into develop

Conflicts:
	htdocs/core/modules/modCommissions.class.php
2012-07-23 11:07:53 +02:00
Regis Houssin
bf807c27e5 Fix: uniformize code 2012-07-23 11:01:36 +02:00
Laurent Destailleur
7a8224c4d5 Normalize code 2012-07-23 10:55:29 +02:00
Laurent Destailleur
ea93e62e91 Fix: Checkstyle 2012-07-23 10:46:09 +02:00
Regis Houssin
6e41d645f0 Merge pull request #251 from cbattarel/commissions
basic commissions management module
2012-07-23 01:37:09 -07:00
Laurent Destailleur
db4c6bd289 New: After first install, warning are visible onto mandatory setup
not configured. Show also total number of activated modules.
2012-07-22 01:03:19 +02:00
Christophe Battarel
b8fa4468ce add commissions module 2012-07-20 16:21:35 +02:00
Regis Houssin
fafd79a0f8 Fix: uniformize code (in progress) 2012-07-20 09:57:50 +02:00
Christophe Battarel
98a2cf547e correct module description and image 2012-07-19 16:27:08 +02:00
Christophe Battarel
c12c8bd0bb update margin modules to core module 2012-07-18 16:13:29 +02:00
Regis Houssin
b53d108c50 Fix: uniformize code 2012-07-11 10:14:56 +02:00
Regis Houssin
28ccc43125 Fix: avoid another warning 2012-07-10 20:45:07 +02:00
Regis Houssin
b4617ee6cb Fix: bad test 2012-07-10 18:57:09 +02:00
Regis Houssin
226caf0152 Fix: and again, and again, and again... (strict mode) 2012-07-10 13:20:53 +02:00
Regis Houssin
ca62c3dba8 Fix: compatibility with multicompany 2012-07-06 20:50:24 +02:00
Regis Houssin
30989fc6c3 Fix: lines delimiter 2012-07-04 16:55:14 +02:00
Regis Houssin
293eab7676 New: add possibility to hide vat only if null 2012-07-04 16:52:08 +02:00
Regis Houssin
cc4b2bf69c New: add box activity 2012-07-04 09:07:15 +02:00
Regis Houssin
6f1651309e Fix: global converting lines delimiter 2012-07-02 19:30:37 +02:00
Laurent Destailleur
4176287094 Fix: Panicum module for supplier accountancy code 2012-06-28 19:51:25 +02:00
Laurent Destailleur
87efb2cbb0 Add log 2012-06-27 00:41:57 +02:00
Laurent Destailleur
4792727ca6 Fix: Label was not translated 2012-06-23 15:01:08 +02:00
Regis Houssin
4db07c3d34 Fix: avoid empty email address 2012-06-15 16:54:13 +02:00
Regis Houssin
1155b0097b New: add advanced rights 2012-06-14 20:11:54 +02:00
Laurent Destailleur
ec621d2dcb Fix: Bad calculation of nb of line. Fix: Bad position of lines into pdf_soleil 2012-06-14 19:58:35 +02:00
Regis Houssin
7644fa96dc Fix: uniformize code and add specific rights 2012-06-13 21:48:59 +02:00
Regis Houssin
774be84c54 Merge pull request #220 from GPCsolutions/supplier-orders-box
New box showing the latest supplier orders.
2012-06-11 13:02:01 -07:00
Regis Houssin
cc18dab5c9 Fix: missing remove_file action
Fix: use object instead id and store odt filename in object for use in
triggers
2012-06-10 17:09:10 +02:00
Raphaël Doursenaud
0f410996f7 New box showing the latest supplier orders. 2012-06-04 17:37:38 +02:00
Laurent Destailleur
c1547b6ad0 Fix: Translation of payment term/cond 2012-05-21 20:17:58 +02:00
Laurent Destailleur
30c8fcd0e1 Fix: regression sql error 2012-05-09 16:45:15 +02:00
Laurent Destailleur
50944a71db Checkstyle 2012-05-06 00:45:15 +02:00
Laurent Destailleur
d47a78479e Fix: several fixes 2012-05-05 23:59:14 +02:00
Laurent Destailleur
d804683b32 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2012-04-30 15:18:24 +02:00
Laurent Destailleur
1227642db0 Checkstyle 2012-04-30 15:01:20 +02:00
Regis Houssin
79f2781bdb Merge pull request #188 from FHenry/develop
Develop
2012-04-30 05:33:48 -07:00
Laurent Destailleur
19ce632d7a Removed duplicate file 2012-04-30 14:13:16 +02:00
FHenry
dc42e16ff1 Secure URL use to CheckRead and Unsubcribe with security key in
configuration screen
2012-04-30 13:49:29 +02:00
Laurent Destailleur
5c46c3bcbb Fix: Class not deleted after move. 2012-04-29 10:32:37 +02:00
Laurent Destailleur
8ea079ed96 New: Prepare change to allow usage of print sheet for any purpose (not
only
memeber module).
Qual: Remove duplicate declaration of version.
2012-04-28 16:37:58 +02:00
Regis Houssin
071cef15bf Merge pull request #175 from grandoc/develop
Prepair to display receiptdocument within a custom place and uniformize ...
2012-04-25 09:27:03 -07:00
Grand Philippe
559c7974e9 shipping receipt modele can be used from a custom directory 2012-04-22 10:02:12 +02:00
Grand Philippe
c190d4ddf8 fix : shipping specimen is displayed, and shipping modele can be used from custom place 2012-04-22 09:28:39 +02:00
FHenry
07fc51b7ff Remove Eclipse variable warning 2012-04-20 15:54:37 +02:00
Laurent Destailleur
334adf7ae2 Fix: Bad CR for public note. Must work when text is full text with \n
and also when text is HTML with br.
2012-04-20 13:54:57 +02:00
Laurent Destailleur
9114fec4ed Doxygen 2012-04-16 12:01:32 +02:00
Laurent Destailleur
b315bf3e3a Fix: Generate donation document 2012-04-16 01:23:53 +02:00
Regis Houssin
e49df57667 Fix: compatibility with php 5.4 and E_STRICT mode 2012-04-14 15:04:46 +02:00
Regis Houssin
026ee8ddb7 New: add possibility to define a page break, its very important for
internal and external modules (milestone)
2012-04-12 20:52:41 +02:00
Laurent Destailleur
11c174e209 New: Can export supplier ref
New: Add profid6
2012-04-11 15:27:03 +02:00
Regis Houssin
02d2872ac5 Fix: invert emetteur and problem with long phone number 2012-04-10 12:35:14 +02:00
Regis Houssin
f5097dd605 Fix: missing company logo and invert from to ! 2012-04-10 12:04:14 +02:00
Laurent Destailleur
9df05381d1 Fix: Bug war.
Look: enhance look for map views.
2012-04-08 13:05:58 +02:00
Laurent Destailleur
6d8a639839 Fix [ bug #322 ] export
Fix: pgsql compatibility
2012-04-08 00:05:52 +02:00
Laurent Destailleur
e9292515bc Fix: Long name wrapping. Sender address is third party for supplier
order/invoice
2012-04-07 21:34:42 +02:00
Regis Houssin
921c8607d7 Fix: multicompany sharings and uniformize code 2012-04-07 10:19:33 +02:00
Regis Houssin
13624eeb86 Fix: multicompany sharings compatibility 2012-04-07 09:20:03 +02:00
Laurent Destailleur
6d2a3edf69 War bug 2012-04-07 02:45:31 +02:00
Regis Houssin
f874d68e08 Merge pull request #151 from grandoc/develop
Prepair to display within a custom place
2012-04-05 04:15:49 -07:00
Grand Philippe
a66c18c4f8 Prepair to display within a custom place 2012-04-05 13:00:09 +02:00
Regis Houssin
b30669a5d6 Fix: missing $langs 2012-04-05 11:07:16 +02:00
Laurent Destailleur
a6bbe1032d Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-04-04 17:37:20 +02:00
FHenry
5bfff3920f Module e-maillling : Correctif et evolution Accusé de lecture et
desinscription
2012-04-04 15:23:32 +02:00
Regis Houssin
c57063878d New: add workflow module part for external modules 2012-04-04 09:29:05 +02:00
Regis Houssin
14b6173d87 Fix: add width and minimum height of cells parameters 2012-04-03 18:01:27 +02:00
Laurent Destailleur
bb67c95c3d Uniformize code 2012-04-02 20:08:08 +02:00
Laurent Destailleur
84057d46cc Checkstyle 2012-04-02 18:37:37 +02:00
Laurent Destailleur
46251db167 Qual: Use a shared function to define logo heigth.
Qual: Add more phpunit tests
Fix: This also solve overlapping logos.
2012-04-01 23:57:15 +02:00
Laurent Destailleur
d8c975da3d More fields into import of products 2012-03-30 00:54:41 +02:00
Laurent Destailleur
78ae7dc075 Checkstyle 2012-03-27 09:59:28 +02:00
Laurent Destailleur
52f4f72e6f Checkstyle 2012-03-26 22:39:43 +02:00
Grand Philippe
b3e55e179f first step to use fichinter within a custom place 2012-03-24 18:15:07 +01:00
Regis Houssin
ffc6812241 Fix: avoid php strict mode warning 2012-03-23 18:19:50 +01:00
Regis Houssin
3c794967c3 Fix: multiple avoid warning with php strict mode 2012-03-23 17:18:33 +01:00
Regis Houssin
be7da6f52c Fix: avoid warning in php strict mode 2012-03-23 16:44:45 +01:00
Regis Houssin
1bcbe02562 Fix: wrong original values 2012-03-23 09:15:14 +01:00
Regis Houssin
de16037b93 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-03-23 09:03:58 +01:00
Regis Houssin
77623a9c1b Fix: compatibility with ckeditor 2012-03-23 09:03:36 +01:00
Laurent Destailleur
6b2c141083 Uniformize page name. 2012-03-23 00:08:34 +01:00
Regis Houssin
5d2da2c884 Fix: uniformize code 2012-03-22 08:33:44 +01:00
Laurent Destailleur
b098838b6f Fix: Bad error management when enabling/disabling modules 2012-03-21 13:50:59 +01:00
Regis Houssin
52a8216e3e Fix: avoid php E_STRICT errors and compatibility with php 5.4 2012-03-21 02:12:44 +01:00
Laurent Destailleur
97f0095251 PDF are better with all PDF sizes 2012-03-20 09:22:41 +01:00
Laurent Destailleur
e7d07c0a91 New: add supplier ref on supplier invoice. 2012-03-19 22:26:24 +01:00
Laurent Destailleur
3383d314c9 Doxygen 2012-03-19 17:18:11 +01:00
Laurent Destailleur
d6588a53a1 Fix: Missing global 2012-03-19 11:22:59 +01:00
Regis Houssin
4ecc64504d Fix: use the original json functions 2012-03-18 19:59:38 +01:00
Laurent Destailleur
23d523158a Doxygen 2012-03-18 12:51:13 +01:00
Laurent Destailleur
96e9e088e3 Doxygen 2012-03-18 02:22:54 +01:00
Laurent Destailleur
dc86095c06 Doxygen 2012-03-18 02:19:27 +01:00
Laurent Destailleur
d59848e18e New: Enhance box management 2012-03-17 21:32:10 +01:00
Laurent Destailleur
da94f76364 New: When a module with boxes is activated, box is also activated by
default for everybody, except for users that had personlized their box
view.
2012-03-17 14:29:48 +01:00
Laurent Destailleur
d8becd3cdb Doxygen 2012-03-17 01:13:10 +01:00
Laurent Destailleur
02cdd86066 Doxygen 2012-03-17 00:47:01 +01:00
Laurent Destailleur
3f11e51fbb Doxygen 2012-03-17 00:22:48 +01:00
Laurent Destailleur
46d08a9d3b Doxygen 2012-03-16 09:35:59 +01:00
Laurent Destailleur
6e864bc992 Doxygen 2012-03-16 09:34:19 +01:00
Laurent Destailleur
d76802630a Doxygen 2012-03-15 09:26:14 +01:00
Laurent Destailleur
9e5cffc62b Doxygen 2012-03-14 11:49:11 +01:00
Laurent Destailleur
66bad9ea04 Doxygen 2012-03-13 09:38:00 +01:00
Laurent Destailleur
e4b697fa75 New: Show delivery date into proposal template azur. 2012-03-04 22:18:15 +01:00
Laurent Destailleur
055689e2dc New: Import use generated codes if not provided into input file. 2012-03-04 13:00:53 +01:00
Laurent Destailleur
dd92cea7ed Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-03-03 20:57:00 +01:00
Laurent Destailleur
130bca84d6 Fix: fk_stcomm is no more required. 2012-03-03 20:56:39 +01:00
Regis Houssin
bbbca891f8 Fix: missing entity 2012-03-03 20:19:21 +01:00
Laurent Destailleur
80b75fa67d Fix: boxes must not be removed after update 2012-03-03 17:37:45 +01:00
Laurent Destailleur
2772d1dfa2 Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-03-03 16:34:13 +01:00
Laurent Destailleur
fb6aad19e5 New: Import wizard can import personalized fields 2012-03-03 16:33:38 +01:00
Regis Houssin
5139c0a69e Fix: time is not necessary 2012-03-03 11:38:45 +01:00
Regis Houssin
b74e24ab46 Fix: increase size 2012-03-03 09:06:26 +01:00
Regis Houssin
047edc69f9 Fix: unit test warning 2012-03-03 07:45:25 +01:00
Laurent Destailleur
cb3104220e Fix: Instantiate if not already done 2012-03-02 19:36:43 +01:00
Regis Houssin
034b0fc4d4 New: add dol_json_encode and dol_json_decode instead
serialize/unserialize
2012-03-02 17:48:05 +01:00
Regis Houssin
30c7bf811b Fix: add pdf_writeLinkedObjects method 2012-03-02 15:03:46 +01:00
Regis Houssin
9301def08d Fix: rename method 2012-03-02 15:03:14 +01:00
Regis Houssin
61e90e0d9d Fix: add $hookmanager parameter 2012-03-02 10:26:03 +01:00
Regis Houssin
71e5e27e7e Fix: instantiate $hookmanager if not exist 2012-03-02 10:16:50 +01:00
Regis Houssin
64b8486494 New: add method for show linked objects in pdf 2012-03-02 08:11:40 +01:00
FHenry
0cf4619682 Emailing campaign- unsubcribe and use of md5 tag 2012-03-01 14:51:07 +01:00
Laurent Destailleur
9174182a27 Fix: Removed warning 2012-03-01 09:24:45 +01:00
Regis Houssin
6aa7e90834 Fix: merge problem 2012-03-01 08:03:27 +01:00
Regis Houssin
f3cb926c3c Fix: use generic array for all parts 2012-03-01 13:58:33 +08:00
Laurent Destailleur
7c4e908639 models_modules isn't enough so we use same facture_invoice,
commande_invoice, propale_invoice. This means module descriptor file
should contains
module_parts('facture'=>1) if we want to add doc template for invoice
into module/core/modules/facture/doc
2012-03-01 02:06:08 +01:00
Laurent Destailleur
51fb1b2385 Fix: Code was sharing loop for custom dir and loop for subdir modules.
The loop to manage customdir must be managed by the dol_buildpath so
only loop on / + module dir must be done.
2012-02-29 20:07:17 +01:00
Regis Houssin
79c0369d66 Fix: possibility to use models of external modules 2012-03-01 01:24:00 +08:00
Laurent Destailleur
1c4ca9b335 New: Add hidden option MAIN_ADD_PDF_BACKGROUND to add a PDF as
background of invoice/order generated PDF.
2012-02-27 22:57:19 +01:00
Laurent Destailleur
563acb5968 For backward compatibility 2012-02-27 10:18:34 +01:00
Regis Houssin
476168410e Fix: declaration of property 2012-02-27 09:09:34 +01:00
Regis Houssin
03e68b3d77 Fix: avoid warning 2012-02-27 09:04:41 +01:00
Laurent Destailleur
16ad5452b6 Fix: When company name is too long, wrapping overwrite address. 2012-02-26 14:27:19 +01:00
Laurent Destailleur
45f2f7b449 Fix: Second field is required 2012-02-25 16:14:59 +01:00
Regis Houssin
e2cea80f69 Fix: problem with this pdf 2012-02-24 17:25:53 +01:00
Regis Houssin
8e023bb384 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-02-24 16:32:29 +01:00
Regis Houssin
13f2fe84f9 Fix: missing object $db and missing variables declaration 2012-02-24 16:31:51 +01:00
Laurent Destailleur
cc6a2c8d84 Fix: Compatibility of new module setup with old setup 2012-02-24 11:06:05 +01:00
Regis Houssin
1b236c5c56 Fix: possibility to add more parameters (eg: entity=0) 2012-02-24 15:53:38 +08:00
Regis Houssin
a68ac56e5b Fix: remove obsolete code 2012-02-23 22:01:55 +01:00
Regis Houssin
673fbc457d Fix: add debug mode and change with new module parts management 2012-02-23 20:42:25 +01:00
Regis Houssin
e536bef00e Fix: serialize array parameters (hooks) 2012-02-23 19:51:56 +01:00
Regis Houssin
46ad02cbc8 New: add generic function for module parts 2012-02-23 15:42:03 +01:00
Laurent Destailleur
2647cb72ac New: Now all features can be provided by a module with all files inside
the directory of module.
2012-02-22 16:18:03 +01:00
simnandez
282a50512f Fix: Use transnoentities into description 2012-02-22 09:44:46 +01:00
Regis Houssin
8b107b65e8 Fix: compatibility with multi-company shared 2012-02-21 18:09:21 +08:00
Laurent Destailleur
b8a61e73a0 New: Add product_label into substitution tags for ODT. 2012-02-20 23:58:36 +01:00
Laurent Destailleur
8d6655061e Qual: Full description of lines for ODT generation share same
function.
2012-02-19 21:08:17 +01:00
Laurent Destailleur
c4b845d60a Qual: Removed deprecated function name. 2012-02-19 18:34:22 +01:00
Laurent Destailleur
e903719c36 Qual: Uniformize code
Perf: Very small per enhancement
2012-02-19 17:12:17 +01:00
Laurent Destailleur
d87e0eaae0 Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-02-19 15:21:04 +01:00
Laurent Destailleur
75312655f1 Qual: More robust error code management when a box is renamed. 2012-02-19 13:12:11 +01:00
Regis Houssin
2cd9bcea90 Fix: restore broken encryption 2012-02-19 09:59:13 +01:00
Laurent Destailleur
a500033b10 New: Add postgresql function to resynchronize sequences 2012-02-19 03:21:10 +01:00
Laurent Destailleur
0a17345415 Doxygen 2012-02-16 18:39:22 +01:00
Regis Houssin
cd3452d71d Fix: multicompany sharings and uniformize code 2012-02-11 10:18:09 +01:00
Regis Houssin
645d72c4a6 Fix: some bugs for multicompany sharings 2012-02-11 08:03:26 +01:00
Laurent Destailleur
aea54edfa2 Qual: Uniformize code 2012-02-08 13:43:49 +01:00
Laurent Destailleur
842fb07d08 Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-02-08 00:22:58 +01:00
Laurent Destailleur
104a4532b9 Fix: miscellaneous not initialized vars 2012-02-07 18:48:50 +01:00
Laurent Destailleur
d686c52b63 Fix: usage of custom dir for supplier invoices 2012-02-07 18:21:22 +01:00
Laurent Destailleur
55f6cdd495 Qual: Removed warnings 2012-02-07 10:25:58 +01:00
Laurent Destailleur
2093b3f0be New: Allow to use ODT templates for prososal like it's done for invoices 2012-02-05 19:37:52 +01:00
Regis Houssin
3302a86f0c Fix: add entity field in llx_paiement 2012-02-01 18:29:06 +01:00
Regis Houssin
7096bc8d7f Update htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php 2012-02-01 15:11:05 +01:00
Regis Houssin
ec3f5d121c Merge pull request #102 from simnandez/develop
[ task #176 ] Allow to use ODT templates. Works with Orders
2012-02-01 06:09:21 -08:00
Laurent Destailleur
0a78b3f970 Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-02-01 14:22:35 +01:00
Laurent Destailleur
f1cd91dac5 Fix: Permission on donation module 2012-02-01 14:20:22 +01:00
Regis Houssin
c6e4206907 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-02-01 11:33:11 +01:00
Regis Houssin
4431510ce4 Fix: use entity field of object 2012-02-01 11:32:55 +01:00
simnandez
53cdb31624 [ task #176 ] Allow to use ODT templates. Works with Orders 2012-01-30 18:18:40 +01:00
Laurent Destailleur
d7f7ec2372 Fix: Position of address 2012-01-29 21:46:55 +01:00
Simnandez
1f0c04a8a9 [ task #176 ] Allow to use ODT templates. Works with Orders 2012-01-27 22:35:23 +01:00
simnandez
15d1526393 [ task #176 ] Allow to use ODT templates. Works with Orders 2012-01-27 17:41:47 +01:00
Laurent Destailleur
d596920898 Doxygen 2012-01-23 18:43:30 +01:00
Regis Houssin
a29565f628 Fix: uniformize code 2012-01-23 16:38:57 +01:00
Regis Houssin
190cc7b13c Fix: uniformize structure 2012-01-23 14:43:31 +01:00
Laurent Destailleur
d8f96328f8 Move properties 2012-01-22 02:28:49 +01:00
Laurent Destailleur
70a67bc3f1 Qual: Move a not frequently used function out of functions.lib.php
Enhance PHPUnit tests
2012-01-21 14:10:22 +01:00
Laurent Destailleur
77bd02e573 Fix: user is not defined during definition but during runtime, so by
import process.
2012-01-20 18:41:44 +01:00
Regis Houssin
156501820c Fix: no $user object in update mode 2012-01-20 17:32:54 +08:00
Regis Houssin
66e9ea244d Fix: Trying to get property of non-object 2012-01-20 17:32:53 +08:00
Laurent Destailleur
7fd27da616 Fix: Wrong count of nb of lines 2012-01-20 10:09:19 +01:00
Laurent Destailleur
a8ca1c721c Uniformize way of working of trip and expenses (added "validate" step
after "draft").
2012-01-18 01:05:26 +01:00
Laurent Destailleur
9af78f97a8 Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-01-18 00:39:39 +01:00
Laurent Destailleur
536b431452 Fix: SUPPLIER_INVOICE_FREE_TEXT 2012-01-18 00:38:53 +01:00
Laurent Destailleur
9215394965 New: Import wizard can import contacts.
New: A module can add import description for import wizard, even for
tables with foreign keys.
2012-01-18 00:16:02 +01:00
Spangaro Alexandre
28550dca89 Add function block/unblock for a trip credit note
Signed-off-by: Spangaro Alexandre <alexandre.spangaro@gmail.com>
2012-01-17 15:11:04 +08:00
Regis Houssin
64e0a4434d Fix: use fk_mainmenu if defined 2012-01-16 19:11:45 +08:00
Regis Houssin
8adac462fa Fix: share customer code with a referent entity 2012-01-12 18:51:40 +08:00
Laurent Destailleur
f8b2a2c774 New: Move mailman and spip feature into a specific module 2012-01-11 18:43:38 +01:00
Laurent Destailleur
9209c7c6bc Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-01-11 02:05:50 +01:00
Laurent Destailleur
86825e4c9b New: Show payments terms and conditions onto muscadet template. 2012-01-10 21:12:01 +01:00
Regis Houssin
cb286a2449 New: add shareds thirparties between entities 2012-01-11 00:19:57 +08:00
Laurent Destailleur
b2cd7018db Doxygen 2012-01-10 10:53:04 +01:00
Laurent Destailleur
f86ae93526 Qual: Removed checkstyle warnings 2012-01-10 10:23:57 +01:00
Laurent Destailleur
c6a96fec73 Qual: Uniformize lib filename 2012-01-08 01:59:33 +01:00
Regis Houssin
b9d9f3b5b1 Fix: bad path in error message 2012-01-06 10:19:07 +01:00
Laurent Destailleur
c598fb34c0 Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-01-05 13:10:14 +01:00
Laurent Destailleur
7a00c793c6 Fix: SQL syntax error 2012-01-05 12:59:24 +01:00
Regis Houssin
37c7d2b102 Merge pull request #84 from simnandez/develop
[ task #176 ] Allow to use ODT templates for prososal like it's done for invoices. Working
2012-01-04 23:51:10 -08:00
Regis Houssin
187c54ae7f [task #176] Allow to use ODT templates for prososal like it's done 2012-01-05 08:49:48 +01:00
Laurent Destailleur
3f8d2cbef8 Qual: Remove checkstyle warnings 2012-01-04 21:23:50 +01:00
Laurent Destailleur
90b7cd1aae [ task #176 ] Allow to use ODT templates for prososal like it's done for
invoices. Move pdf and odt to doc dir
2012-01-04 02:04:55 +01:00
simnandez
283bb8e766 [ task #176 ] Allow to use ODT templates for prososal like it's done
for invoices. Working
2012-01-03 17:01:18 +01:00
simnandez
7d9b5a7545 [ task #176 ] Allow to use ODT templates for prososal like it's done
for invoices. Move pdf and odt to doc dir
2012-01-03 16:42:20 +01:00
simnandez
2a61569d9a [ task #176 ] Allow to use ODT templates for prososal like it's done for
invoices. Firsts works
2012-01-02 18:23:41 +01:00
Laurent Destailleur
2d2ba75ad2 New: When invoice was generated from order, order date is visible on
PDF, after order ref.
2011-12-31 14:56:45 +01:00
Laurent Destailleur
92c27b1732 New: Can add a left menu (first level) into an existing top menu. 2011-12-31 01:33:12 +01:00
Laurent Destailleur
4ea77e6d55 Prepare code to allow left menu add by modules 2011-12-30 23:07:27 +01:00
Laurent Destailleur
c2348ef600 Uniformize field country_id, country_code, country 2011-12-29 18:07:41 +01:00
Laurent Destailleur
0f14bb64e7 New: Can set country id for import of third party 2011-12-22 00:19:30 +01:00
Laurent Destailleur
721c9a6f5b Fix: [ bug #253 ] Non UTF-8 characters in CSV exports 2011-12-21 16:10:11 +01:00
Laurent Destailleur
95a292f41b Fix: Update licence files 2011-12-17 21:58:44 +01:00
Laurent Destailleur
3c611d284a Qual: Removed deprecated code/comments 2011-12-17 18:35:12 +01:00
Laurent Destailleur
3687dc8be9 Fix: Mime detection 2011-12-17 01:16:33 +01:00
Laurent Destailleur
1b998d5443 Fix: Removed a bug with pgsql 2011-12-12 00:07:28 +01:00
Laurent Destailleur
147ddd6551 Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2011-12-08 20:20:59 +01:00
Laurent Destailleur
604127acd3 Doxygen 2011-12-08 20:18:00 +01:00
Regis Houssin
420acb3491 Fix: bad path 2011-12-08 09:28:19 +01:00
Regis Houssin
4e8b0a2eb5 Merge pull request #63 from grandoc/develop
Develop
2011-12-07 10:35:54 -08:00
Grand Philippe
2920d5d840 uniformize code 2011-12-07 16:20:29 +01:00
Laurent Destailleur
1f37dc906f Qual: Uniformize name of barcode into "barcode". 2011-12-07 11:59:41 +01:00
Laurent Destailleur
b52fc32853 Fix: fix not initialized variables 2011-12-05 19:41:38 +01:00
Laurent Destailleur
ffaf4e5465 Fix: fix not initialized variables 2011-12-05 19:03:36 +01:00
Laurent Destailleur
ebea7f6c97 Fix: fix not initialized variables 2011-12-05 18:36:54 +01:00
Regis Houssin
26646a98d8 Fix: missing translate parameter 2011-12-04 10:57:22 +01:00
Laurent Destailleur
56a0e26465 Fix: Removed tons of warnings 2011-12-01 17:09:01 +01:00
Laurent Destailleur
9f889b0439 Qual: Uniformize code for document generation of shipments.
Prepare usage of odt templates.
2011-11-30 12:28:01 +01:00
Laurent Destailleur
a47a16f281 Fix: Select target on supplier category 2011-11-30 11:55:33 +01:00
Laurent Destailleur
04dcc86f1a Fix: barcode generation using genbarcode is ok. 2011-11-28 23:07:19 +01:00
Laurent Destailleur
9d1a008768 Qual: Clean code for barcode 2011-11-27 22:55:49 +01:00
Laurent Destailleur
0e4d70d664 Qual: Clean barcode module. First step to remove php-barcode. 2011-11-27 15:33:18 +01:00
Laurent Destailleur
8614ef5bef doxygen 2011-11-26 12:36:36 +01:00
Laurent Destailleur
e170c477a3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2011-11-25 02:04:31 +01:00
Laurent Destailleur
781b41737f Fix: filter by categ 2011-11-25 02:03:02 +01:00
Regis Houssin
919523f2e2 Change default prefix if needed 2011-11-24 08:23:16 +01:00
Regis Houssin
86a48c8962 Fix: change the last database prefix 2011-11-23 21:43:25 +01:00
Laurent Destailleur
71e0f825b2 New: Add box for expired services 2011-11-23 18:10:10 +01:00
Laurent Destailleur
839781dfbe Qual: Removed a TODO by renaming all ->monnaie into ->currency 2011-11-23 14:55:36 +01:00
Laurent Destailleur
1770a46519 Qual: Removed tons of warning 2011-11-22 14:00:03 +01:00
Regis Houssin
7a34f4d5e4 Fix: remove duplicate field 2011-11-19 09:45:01 +01:00
Laurent Destailleur
b81938fe95 Uniformize code and doxygen 2011-11-13 11:45:25 +01:00
Laurent Destailleur
9ec3500b1f New: Add option INVOICE_POSITIVE_CREDIT_NOTE 2011-11-11 00:36:01 +01:00
Regis Houssin
f0c327c070 Fix: uniform code
replace all $html by $form with exceptions "$htmlname, $htmltooltip"
2011-11-08 17:22:31 +08:00
Laurent Destailleur
8193e8a54e Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2011-11-06 15:45:03 +01:00
Laurent Destailleur
8d46ae1d35 Qual: Better error managment on numbering setup 2011-11-06 15:12:18 +01:00
Regis Houssin
75ed344520 Fix: invalid EOL char 2011-11-06 09:51:55 +01:00
Laurent Destailleur
2240f5db44 Fix: Localisation of prices 2011-11-06 00:40:42 +01:00
Laurent Destailleur
40da2e23d2 Qual: Reduce sub-options of module fckeditor. This make code cleaner
and all this duplicated options were useless.
2011-11-05 23:18:49 +01:00
Laurent Destailleur
c16c09a451 Qual: Mutualize code to delete previews 2011-11-04 00:27:30 +01:00
Regis Houssin
7bb76a8cb2 Fix: translation 2011-11-01 15:18:33 +01:00
Laurent Destailleur
de842ef1e1 Doxygen
Fix: Bad vars
2011-10-29 18:15:54 +02:00
Laurent Destailleur
d183265702 Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2011-10-29 17:47:30 +02:00
Regis Houssin
dea1210c2d Fix: edit in place datepicker more stable 2011-10-28 19:31:42 +02:00
Laurent Destailleur
b6b48d61bf New: Cheques into cheques receipts are ordered by operation date. 2011-10-28 00:47:28 +02:00
Laurent Destailleur
e780eadeed Fix: Substitution of free text 2011-10-27 10:07:58 +02:00
Laurent Destailleur
3025359899 Fix: Substitution missing 2011-10-27 02:44:05 +02:00
Laurent Destailleur
daf19d0d07 Fix: Some fix for barcode generation 2011-10-26 12:58:10 +02:00
Laurent Destailleur
408ec1bc29 Fix: Moved file that seems to belongs to external module 2011-10-26 12:26:04 +02:00
Regis Houssin
fafde60d2c Fix: add empty index files 2011-10-24 15:27:10 +02:00
Regis Houssin
3338649316 [task #217] Move core files in core directory 2011-10-24 14:11:49 +02:00