Commit Graph

40737 Commits

Author SHA1 Message Date
aspangaro
fca29f4312 Add table into script migration && key language 2014-03-06 21:29:20 +01:00
aspangaro
048b3c01ce Add salary payment in tax module - Link to user.
Necessary for future hrm module.
2014-03-06 21:21:16 +01:00
Laurent Destailleur
15aebfb7a3 Merge pull request #1455 from marcosgdf/bug-loadban
Corrected bug when creating document from ODT template
2014-03-06 18:38:56 +01:00
Laurent Destailleur
260dfe3844 Merge pull request #1454 from marcosgdf/locale-line-odt-tags
Locale line ODT tags
2014-03-06 18:34:33 +01:00
Laurent Destailleur
0283c16a47 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2014-03-06 18:27:09 +01:00
Laurent Destailleur
d54dce1dbe Merge pull request #1452 from KreizIT/develop
Correct multiline comments not manage by dolibarr
2014-03-06 18:24:27 +01:00
Laurent Destailleur
cd3e56a2d0 Merge pull request #1450 from grandoc/develop
fix english misspelling
2014-03-06 18:23:51 +01:00
Laurent Destailleur
1396fb1dbe Merge pull request #1448 from GPCsolutions/tcpdf-monotype
TCPDF: Replaced missing courier monotype font by provided freemono
2014-03-06 18:23:22 +01:00
Raphaël Doursenaud
2f150a8927 Updated dolibarr_changes 2014-03-06 18:15:50 +01:00
Laurent Destailleur
b762c66c8a Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2014-03-06 18:04:19 +01:00
Laurent Destailleur
270eaf7aca Qual: Uniformize search date for lists. 2014-03-06 17:02:27 +01:00
Laurent Destailleur
c4c82f84c5 Fix: Typo 2014-03-06 16:41:56 +01:00
Marcos García de La Fuente
ca0eb7919e Corrected call to non-existing function 2014-03-06 09:02:36 +01:00
Marcos García de La Fuente
4433f6e8b7 Missing copyright info 2014-03-06 09:01:44 +01:00
Marcos García de La Fuente
c7566893a3 Corrected array indentation 2014-03-06 08:56:28 +01:00
Marcos García de La Fuente
2c22c7707f Created locale ODT line tags for invoice, shipment and order modules, and corrected the use of line_price_ht, line_price_ttc and line_price_vat tags 2014-03-06 08:55:37 +01:00
Laurent Destailleur
fa098adc78 Fix: infinite loop in function num_public_holiday 2014-03-05 21:29:33 +01:00
Laurent Destailleur
774017672f Fix: Number of day calculation. Add PHPUnit case. 2014-03-05 20:52:27 +01:00
Laurent Destailleur
dd3169e1ed Sync from transifex 2014-03-05 20:47:22 +01:00
Laurent Destailleur
6f60755426 New: Add option MAIN_FAVICON_URL 2014-03-05 17:26:59 +01:00
Laurent Destailleur
8f31af9825 Fix: Translation 2014-03-05 16:42:10 +01:00
Laurent Destailleur
16a074a69b Use better module id number 2014-03-05 12:25:31 +01:00
Laurent Destailleur
e9b9491a35 Clean database. Fix with firefox. 2014-03-05 12:15:47 +01:00
KreizIT
a80ecc8052 Correct multiline comments not manage by dolibarr
Avoid error in loading data and also loading data which not be to.
2014-03-05 12:06:01 +01:00
Laurent Destailleur
a3fcb5ac5a Fix: Regression with firefox 2014-03-05 11:52:51 +01:00
Laurent Destailleur
6c536d43e5 Can also sort on username. Uniformize code of index page. 2014-03-05 11:37:32 +01:00
Laurent Destailleur
e9adec49eb Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-03-05 11:22:12 +01:00
Laurent Destailleur
60327e92d1 New: Add filter on text and status into survey list. Can also sorter on
id, text and date end.
2014-03-05 11:22:01 +01:00
Grand Philippe
e32d31f76d fix english misspelling 2014-03-05 09:58:52 +01:00
philippe
e2b29bb108 fix english misspelling 2014-03-05 09:57:36 +01:00
Laurent Destailleur
cdd2815d45 Merge pull request #1449 from KreizIT/dluo_step2
Dluo step2
2014-03-05 00:08:58 +01:00
Laurent Destailleur
0bdf1131df Merge pull request #1447 from zongap/patch-2
Update index.php from Project folder
2014-03-05 00:05:28 +01:00
Laurent Destailleur
802ed4e675 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-03-04 23:56:58 +01:00
Laurent Destailleur
c5e639041e More doc comment 2014-03-04 23:56:35 +01:00
Laurent Destailleur
82018bf752 Merge pull request #1445 from KreizIT/dluo_step1
Batch number management step 1 : database modification
2014-03-04 23:41:20 +01:00
KreizIT
7f275dfbf4 - Add table modification for product (forget in step 1)
- Add module for batch number management
- change dependency for stock and product
- change product class and fiche showing new select for batch managment on product
2014-03-04 18:55:55 +01:00
Raphaël Doursenaud
9a1919238f TCPDF: Replaced missing courier monotype font by provided freemono
The courier font is missing from TCPDF's directory.
This leads to "TCPDF ERROR: Could not include font definition file: courier" being outputed by PHP
when the library attempts to render an element with a monotyped font.
Use freemono instead since it's a better alternative (e.g. supports more glyphs) and is already
shipped with Dolibarr.
2014-03-04 08:19:59 +01:00
Léo
aeaf4bf5f8 Update index.php from Project folder
A trailing "quote" sign was causing a problem with the link generation of href in the recap table on dashboard.
2014-03-04 02:29:18 +01:00
Laurent Destailleur
b2d9fac993 More complete sql file 2014-03-03 19:39:44 +01:00
Laurent Destailleur
24b0ea6613 Merge remote-tracking branch 'origin/3.5' into develop
Conflicts:
	build/makepack-dolibarr.pl
	htdocs/comm/propal.php
	htdocs/compta/facture.php
	htdocs/fourn/class/fournisseur.commande.class.php
2014-03-03 19:38:02 +01:00
Laurent Destailleur
ba90565982 Removed hard coded value of version from makepack-dolibarr.pl script. 2014-03-03 19:08:13 +01:00
KreizIT
c1f88d99b9 Batch number management step 1 : database modification 2014-03-03 14:11:19 +01:00
Laurent Destailleur
c2e3d92a37 Update images 2014-03-02 20:30:30 +01:00
Laurent Destailleur
df829177bc Fix: Submit form of graph box was reseting params of others. 2014-03-02 17:45:40 +01:00
Laurent Destailleur
c3bc0cc8d1 Add demo sql file for 3.6 2014-03-02 16:57:37 +01:00
Laurent Destailleur
fd9d0747c8 Fix: Bad description 2014-03-02 16:44:31 +01:00
Laurent Destailleur
d9dc8de4e6 Fix: Badd error message 2014-03-02 15:58:02 +01:00
Laurent Destailleur
748d769140 Fix: [ bug #1280 ] service with not end of date was tagged as expired. 2014-03-02 15:50:26 +01:00
Laurent Destailleur
8bd72cc21f Fix: wrapping into combo 2014-03-01 20:05:08 +01:00
Laurent Destailleur
7d7a72b8f1 More interactive autoselect of fields 2014-03-01 20:02:35 +01:00