Commit Graph

43078 Commits

Author SHA1 Message Date
Alexis Algoud
d139009ef5 bug on update service with service created in 3.4 2014-03-05 15:29:28 +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
KreizIT
d9ea0e0e8c Travis again (It's susceptible) 2014-03-05 11:30:43 +01:00
KreizIT
031adcfa19 Merge branch 'dluo_step3' of github.com:KreizIT/dolibarr into dluo_step3 2014-03-05 11:30:04 +01:00
KreizIT
feae560aa3 Travis correction. 2014-03-05 11:28:40 +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
KreizIT
6c2232d166 Travis correction. 2014-03-05 11:13:23 +01:00
KreizIT
bdb3aa0a69 Merge branch 'dluo_step3' of github.com:KreizIT/dolibarr into dluo_step3
Conflicts:
	htdocs/product/stock/product.php
2014-03-05 11:10:46 +01:00
KreizIT
58f2bf078b -Add batch record management
-Implements stock increase or decrease with batch number record on product's warehouse tab
2014-03-05 10:54:07 +01:00
KreizIT
81e07fe50f -Add batch record management
-Implements stock increase or decrease with batch number record on product's warehouse tab
2014-03-05 10:30:06 +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
Laurent Destailleur
bea6887f9c Merge pull request #1444 from atm-alexis/3.5
debug planned_workload loosing value on error
2014-03-04 23:39:51 +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
Alexis Algoud
9de372d4b1 debug planned_workload loosing value on error 2014-03-02 17:33:51 +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
Laurent Destailleur
d69cee03d8 More interactive autoselect of fields 2014-03-01 19:45:13 +01:00
Laurent Destailleur
c6fb7996ba Fix: [ bug #1238 ] When creating accompte with a %, free product are
used for calculation.
2014-03-01 19:11:13 +01:00
Laurent Destailleur
7db903e671 Fix: special code was lost during update 2014-03-01 16:58:10 +01:00
Laurent Destailleur
998ecc3c15 Optimize code. 2014-03-01 15:59:09 +01:00
Laurent Destailleur
b6cefee45a Fix: [ bug #1240 ] traduction 2014-03-01 15:21:11 +01:00
Laurent Destailleur
0b83f1a670 Merge remote-tracking branch 'origin/3.4' into 3.5 2014-03-01 15:06:25 +01:00
Laurent Destailleur
6f4de6e6d0 Fix: [ bug #520 ] Product statistics and detailed lists are wrong 2014-03-01 15:05:00 +01:00
Laurent Destailleur
8d28087e69 Fix: [ bug #1206 ] PMP price is bad calculated 2014-03-01 14:58:33 +01:00
Laurent Destailleur
dfb4117bb5 Fix: Invalid image link 2014-03-01 14:58:06 +01:00
Laurent Destailleur
16d759b0d6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-03-01 14:55:11 +01:00
Laurent Destailleur
325b9c9688 Qual: Removed dead code 2014-03-01 14:54:11 +01:00