Commit Graph

3270 Commits

Author SHA1 Message Date
Laurent Destailleur
1667228d74 Fix: Normalize new trigger names. 2012-12-29 16:42:30 +01:00
Laurent Destailleur
35a9fbda59 Merge pull request #556 from marcosgdf/3.3
Improved translations
2012-12-29 07:29:29 -08:00
Laurent Destailleur
ca6e9643ea Fix: Pb in json function for objects 2012-12-29 12:21:13 +01:00
Laurent Destailleur
7d60c33c1a Fix: typo 2012-12-29 12:16:45 +01:00
Laurent Destailleur
17a3204578 Fix: dol_json_encode was wrong with objects 2012-12-29 06:51:12 +01:00
Marcos García
bae8a749b8 Replaced 'Tel' string with 'Phone' to allow translation 2012-12-29 02:51:35 +01:00
Marcos García
354c00b9ca CerfaFR donation template wasn't translating payment mode 2012-12-29 01:13:31 +01:00
Laurent Destailleur
2bec26c32a Fix: Some fix into menu translation 2012-12-28 19:18:04 +01:00
Laurent Destailleur
012ee020a4 Fix: Bad label 2012-12-28 15:48:20 +01:00
Laurent Destailleur
8436f0666d Fix: [ bug #252 ] Contrat : pas d'éditeur WYSIWYG
Fix: Margins information must be visible for orders, proposals and
invoices only.
Fix: Delete button for contracts not visible
2012-12-28 11:36:31 +01:00
Laurent Destailleur
a8012d0f18 Fix: [ bug #617 ] champs non repris lors d'une création de commande à
partir d'une propale
2012-12-27 18:02:36 +01:00
Laurent Destailleur
1a530d0ca9 Fix: Broken translation 2012-12-27 17:12:35 +01:00
Laurent Destailleur
ba4be70a5e Fix: External user was not using correct menu handler. 2012-12-27 17:06:55 +01:00
Laurent Destailleur
f566cd4d99 Fix: Use date of user to define if an action is in past or future. 2012-12-27 15:43:52 +01:00
Laurent Destailleur
251f4f3742 Fix: Avoid duplicate link 2012-12-27 15:33:18 +01:00
Laurent Destailleur
f1671e5acf Fix: Remove last chackstyle errors 2012-12-21 11:59:55 +01:00
Laurent Destailleur
8f2baf08ac Fix: Checkstyle 2012-12-21 04:14:02 +01:00
Laurent Destailleur
bcd2fead3d Fix: patch from forum "User permissions on modAgenda" 2012-12-20 17:07:15 +01:00
Laurent Destailleur
e39ec132e5 Fix: Checkstyle 2012-12-19 20:59:08 +01:00
Laurent Destailleur
78a1354a52 Fix: Solve phpunit regression.
Include an option to support local tax of type 7 (need more time to
validate this type).
2012-12-19 18:51:49 +01:00
Laurent Destailleur
e9d7a4adc6 Fix: Removed warnings 2012-12-19 15:29:27 +01:00
Laurent Destailleur
11ab579639 Fix: Several fixes to avoid PDF lib conflicts. 2012-12-19 13:06:45 +01:00
Laurent Destailleur
6b01c45210 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2012-12-18 13:14:29 +01:00
Laurent Destailleur
4cc44292e7 Fix: Maxi debug of holiday module 2012-12-18 13:12:11 +01:00
Laurent Destailleur
752aabfc86 Fix: dynamic menu does not works with auguria. Add a temporary fix. 2012-12-17 23:19:48 +01:00
Regis Houssin
65090c582d Fix: checkstyle 2012-12-15 11:39:47 +01:00
Laurent Destailleur
5a99076cf5 Fix: Clean amarok style. Removed hard coded length of close cells. 2012-12-14 18:35:50 +01:00
Laurent Destailleur
c36d013971 Fix: Link missing 2012-12-14 17:55:42 +01:00
Regis Houssin
b09a44701e Fix: wrong EOL 2012-12-13 13:08:03 +01:00
Regis Houssin
5f41174cfa Fix: bad path for photo and uniformize code 2012-12-13 11:42:59 +01:00
Laurent Destailleur
57742b347a Fix: Bad position of field with non A4 pages 2012-12-12 20:58:49 +01:00
Laurent Destailleur
a11e4b5124 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-12-12 19:02:38 +01:00
Laurent Destailleur
c107697dc1 Fix: Var not always initialized 2012-12-12 18:14:21 +01:00
Laurent Destailleur
e2e86e16d0 Merge pull request #537 from grandoc/develop
Develop
2012-12-12 07:01:54 -08:00
Laurent Destailleur
bdb112c820 Fix: Using bad root url. 2012-12-12 14:46:13 +01:00
Grand Philippe
dc0558989b Merge remote-tracking branch 'origin/develop' into develop 2012-12-11 19:04:54 +01:00
Laurent Destailleur
f4459ee1f1 Fix: Regression detected by PHPUnit 2012-12-10 19:06:59 +01:00
Grand Philippe
a91a96e72e merge 2012-12-10 10:02:13 +01:00
Laurent Destailleur
77ca4241a5 New: Can input a payment back onto an credit note. 2012-12-09 18:39:42 +01:00
fhenry
b3d21a4320 Fix [ bug #634 ] Install faild on PostGreSQL
Fix  [ bug #631 ] Index Creation failed on fresh install with PostgreSQL
2012-12-08 17:01:07 +01:00
Regis Houssin
bfd44da265 Merge pull request #529 from FHenry/develop_extrafielddeletion
Extrafield remove and PgSQL field tms convertion
2012-12-08 05:41:41 -08:00
Laurent Destailleur
6a60b78b28 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-12-08 14:25:36 +01:00
Laurent Destailleur
b119ab5539 Prepare 3.3 freeze. 2012-12-08 14:24:57 +01:00
fhenry
1d6bc23f4d - Uniformize Extrafield deletion for adherent,user,product,societe by
using commonobject method
 - Add convertion of tms timestamp special case in mysql for pgsql
2012-12-08 14:23:52 +01:00
Laurent Destailleur
db91526643 Fix: Solve conflict into migration/backup/restore (child tables
must be after parent tables).
Fix: Migration of old version
2012-12-08 14:16:39 +01:00
fhenry
99f01f1dca [Task 632] : Add standard extra field feature for Agenda 2012-12-08 12:49:20 +01:00
Regis Houssin
f984b669b2 Fix: Fix: Use another method to help avoid having a space in value in
order to use this value with jquery
2012-12-07 13:48:11 +01:00
Regis Houssin
be7d545297 Fix: wrong variable name 2012-12-07 10:50:16 +01:00
Regis Houssin
8ea3614a3c Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-12-07 10:48:10 +01:00
Regis Houssin
7ff3002993 Fix: Check if amount is numeric, for example, an error occured when
amount value = o (letter) instead 0 (number)
2012-12-07 10:47:36 +01:00
Laurent Destailleur
3858085a7f Add option MAIN_HELPCENTER_LINKTOUSE to define target link "I need help"
onto logon page.
2012-12-06 17:59:37 +01:00
Laurent Destailleur
4a5062283d Merge pull request #515 from atm-maxime/develop
New : option to reset numbering to 0 every month using @99 in the mask
2012-12-05 04:19:16 -08:00
Maxime Kohlhaas
5992ebcdbc New : option to reset numbering to 0 every month using @99 in the mask 2013-02-06 11:52:49 +01:00
Regis Houssin
a4f0b7f0df Fix: avoid error with external modules 2012-12-05 11:36:10 +01:00
Regis Houssin
3d4621327c Fix: EOL !! tant que ce problème sera présent, les risques de problèmes
de merge et de conflits sera présent !! il faut utiliser la dernière
version d'Eclipse et de Egit...
2012-12-05 11:18:45 +01:00
Maxime Kohlhaas
954a578ebd Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko559
Conflicts:
	htdocs/install/mysql/migration/3.2.0-3.3.0.sql
2012-12-05 09:10:55 +01:00
Laurent Destailleur
e3d07621eb Fuck git. Restore another lost commit. 2012-12-04 20:51:45 +01:00
Laurent Destailleur
b0b0f06655 Fix: Removed useless code 2012-12-03 20:23:16 +01:00
Laurent Destailleur
9b9b8b4156 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-12-03 20:19:53 +01:00
Laurent Destailleur
bac4bf07a3 New: Add patch from pgrand to start link of several contacts onto an
event
2012-12-03 20:19:35 +01:00
Regis Houssin
a0bed6c47f Fix: For avoid conflicts with external modules 2012-12-03 17:29:08 +01:00
Regis Houssin
4388be7295 FIXME $ident is not defined 2012-12-03 17:16:04 +01:00
Laurent Destailleur
7d8c0837b6 Restore another lost commit. 2012-12-02 19:45:35 +01:00
Laurent Destailleur
fd22705de4 New: Log handler can now manage indent on database transactions 2012-12-02 15:20:45 +01:00
Laurent Destailleur
d578d0be2b Perf: Log optimize. Saved 10KB of memory. 2012-12-02 14:33:24 +01:00
Laurent Destailleur
d428549e15 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-12-02 13:51:52 +01:00
Laurent Destailleur
6fcc32b326 Comments 2012-12-02 12:59:06 +01:00
Regis Houssin
00aa22e1d7 Fix: wrong EOL 2012-12-02 11:03:23 +01:00
Christophe Battarel
c3aa626e18 function getTypeOfLocalTaxFromRate now receives thirdparty in parameter and returns array of localtax type and amount/rate. no more sql in pdf model. 2012-12-02 10:52:53 +01:00
Christophe Battarel
785491ca2c add function gettypeoflocaltax and modify pdf models 2012-12-02 10:51:18 +01:00
Christophe Battarel
8544003d7b remove unused arrays into pdf models (localtaxes)
Conflicts:
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php

Change-Id: I633bfc4b0ec39f9121662d0f876f1edb36173e8e
2012-12-02 10:49:29 +01:00
Christophe Battarel
093468420a show local taxes on crabe pdf model 2012-12-02 10:42:24 +01:00
Laurent Destailleur
09bb10b2a6 Restore lost commit 2012-12-01 15:50:39 +01:00
Laurent Destailleur
4136c27516 RESTORE CODE WITH ID D2adaf7. The Merge daacf79 as lost more than 50
commits !
2012-12-01 15:45:05 +01:00
Maxime Kohlhaas
e45438994c Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko559
Conflicts:
	htdocs/install/mysql/migration/3.2.0-3.3.0.sql
2012-12-01 14:36:51 +01:00
Laurent Destailleur
bba1492621 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-12-01 12:23:12 +01:00
Laurent Destailleur
daacf797c4 Merge pull request #500 from cbattarel/develop
[Task #204] more local taxes manangement
2012-12-01 02:49:45 -08:00
Laurent Destailleur
31b37c5aff Fix: Length not hard coded 2012-12-01 11:31:02 +01:00
Laurent Destailleur
624c0fa040 Fix: Restore compatibility with FPDF. 2012-11-30 20:31:43 +01:00
Laurent Destailleur
9d17b8f96c Fix: Label not complete 2012-11-30 19:39:22 +01:00
Laurent Destailleur
008f5fbcfc New: extrafields are available onto users cards. 2012-11-30 15:55:59 +01:00
Christophe Battarel
b70df3762c Merge branch 'develop' of https://github.com/cbattarel/dolibarr into develop 2012-11-30 10:58:57 +01:00
Christophe Battarel
04718b1832 resolve conflict 2012-11-30 10:57:42 +01:00
Laurent Destailleur
b12469c562 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/holiday/fiche.php
2012-11-29 23:12:16 +01:00
Laurent Destailleur
184cced303 New: Implement all call to allow to remove a tab by an external module 2012-11-29 23:02:02 +01:00
Regis Houssin
3005a4f7cf Fix: use specific code for avoid conflict 2012-11-29 18:37:37 +01:00
Regis Houssin
583dfb225c New: add possibility to force label of buttons and hide the second
button for dialog info only
2012-11-29 18:30:16 +01:00
Christophe Battarel
51d87f8f4a function getTypeOfLocalTaxFromRate now receives thirdparty in parameter and returns array of localtax type and amount/rate. no more sql in pdf model. 2012-11-29 11:36:59 +01:00
Regis Houssin
d97f1937f8 Fix: UPGRADE ECLIPSE AND EGIT WITH THE LAST VERSION PLEASE !!!! 2012-11-29 10:25:33 +01:00
Laurent Destailleur
91e6087d1b Perf: Try to reduce amount of memory used to show events 2012-11-29 00:07:05 +01:00
Laurent Destailleur
8212700c41 Fix: EOL 2012-11-28 19:25:12 +01:00
Laurent Destailleur
b45ef4b578 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-11-28 19:19:56 +01:00
Laurent Destailleur
effe169850 Fix: pdf_getPDFFontSize must be after pdf_getInstance 2012-11-28 19:19:39 +01:00
Christophe Battarel
e459736977 add function gettypeoflocaltax and modify pdf models 2012-11-28 17:47:15 +01:00
Maxime Kohlhaas
5e5cb1da92 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2012-11-28 14:53:48 +01:00
Laurent Destailleur
caab5ac4e0 New: Add option to be able to select onto automatic event and manual
event (or both) into calendar view. Note: For backward compatibility
reason, this will works only for new events.
Qual: Disable old deprecated event code.
2012-11-28 14:47:30 +01:00
Christophe Battarel
f0918a2536 remove unused arrays into pdf models (localtaxes) 2012-11-28 12:13:03 +01:00
Christophe Battarel
1e8aae4de4 show local taxes on crabe pdf model 2012-11-28 12:11:42 +01:00
Laurent Destailleur
b34ce6e2f0 Merge pull request #495 from cbattarel/develop
[ task #204 ] Manage canadian, spain and other country double VAT with a generic system. various updates for local taxes
2012-11-28 02:08:07 -08:00
Maxime Kohlhaas
32f5b4efa6 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2012-11-28 10:57:51 +01:00
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