Commit Graph

43078 Commits

Author SHA1 Message Date
Laurent Destailleur
45161172e8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-05-26 16:52:24 +02:00
Laurent Destailleur
4880aac45f Fix: Regression 2014-05-26 15:24:01 +02:00
Laurent Destailleur
066ae51f1e Merge pull request #1626 from GPCsolutions/qual
Qual
2014-05-26 15:19:49 +02:00
Raphaël Doursenaud
020c662537 Added a script to automatically remove PHP closing tag 2014-05-26 13:54:03 +02:00
Raphaël Doursenaud
c48c3a9d91 Qual: remove PHP closing tag (again)
These were reintroduced by careless merge
2014-05-26 13:51:25 +02:00
Raphaël Doursenaud
12fed4f4d7 Fix: CRLF 2014-05-26 12:32:33 +02:00
Laurent Destailleur
2c4a152823 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-05-26 09:11:08 +02:00
Laurent Destailleur
6db9bb1dda Disable a useless scrutinizer check. 2014-05-26 09:10:48 +02:00
Laurent Destailleur
93f1392e87 Fix: Bugs reported by scrutinizer 2014-05-26 09:07:18 +02:00
Laurent Destailleur
d41f87acab Fix: Option to limit was not used everywhere. 2014-05-26 01:27:22 +02:00
Laurent Destailleur
859b1cac4f Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-05-26 01:14:35 +02:00
Laurent Destailleur
5d9ec6807c Fix: Show duration only if defined. 2014-05-26 01:14:15 +02:00
Laurent Destailleur
4b9d1b901b Fix: [ bug #1401 ] Problème avec la génération des codes barres 2014-05-25 17:14:33 +02:00
Laurent Destailleur
4076a4a643 Fix: select_date accepts -1, '' or a date but not '0' 2014-05-25 14:51:56 +02:00
Laurent Destailleur
6137d7ed45 Update doc 2014-05-25 11:15:26 +02:00
Laurent Destailleur
8e7b310fb6 Fix: [ bug #1400 ] Silent Warning create a draft invoice 2014-05-25 05:01:14 +02:00
Laurent Destailleur
1690da2369 Fix: Bad balance of td 2014-05-25 04:34:04 +02:00
Laurent Destailleur
44ecd504bc Fix: Field ref_supplier and label not filled. Just add FIXME because fix
is too heavy for a maintenance release.
2014-05-25 04:12:08 +02:00
Laurent Destailleur
ae01c785c5 Fix: Do not show ref supplier title if ref_supplier not set (currently
always the case with 3.5).
2014-05-25 03:57:13 +02:00
Laurent Destailleur
936adfd0f5 Typo 2014-05-25 03:08:02 +02:00
BENKE Charles
3d7b6e9a26 Update commonobject.class.php 2014-05-24 19:51:05 +02:00
Laurent Destailleur
9bc1a6b4f5 Fix: favicon must use dol_buildpath and not hardcoded path
Conflicts:
	htdocs/core/lib/security2.lib.php
2014-05-24 18:29:22 +02:00
Laurent Destailleur
44ebaf45cf Fix: favicon must use dol_buildpath and not hardcoded path 2014-05-24 18:21:05 +02:00
Laurent Destailleur
e6f828cd86 Link to Preferred Partners missing. 2014-05-24 17:00:49 +02:00
Laurent Destailleur
a51e18a5a7 Fix: $error var must use type int and be increased when error found.
Using $error as boolean at some place was source of error.
2014-05-24 15:20:26 +02:00
Laurent Destailleur
872e764c94 Fix: html detection was not working with hx tags. 2014-05-24 14:57:41 +02:00
Laurent Destailleur
2a6b2a4540 Fix: Stat page show no cache when there is, if user was using apc. 2014-05-24 14:00:58 +02:00
Laurent Destailleur
b11ef37c58 Fix: Bad balance of table 2014-05-24 12:59:44 +02:00
Laurent Destailleur
1df758320d Fix: the delivery date must not be set with date of proposal. 2014-05-24 12:55:39 +02:00
Laurent Destailleur
f34aadef3d Fix: css 2014-05-23 21:06:53 +02:00
Laurent Destailleur
23e951ff2a Fix: select_date accepts -1 or '' but not 0 2014-05-23 20:54:23 +02:00
Laurent Destailleur
a63d085181 Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-05-23 20:22:40 +02:00
Laurent Destailleur
8840e28bc0 Merge branch 'marcosgdf-bug-1405' into 3.5 2014-05-23 20:21:59 +02:00
Laurent Destailleur
07bc933110 Merge branch 'bug-1405' of github.com:marcosgdf/dolibarr into
marcosgdf-bug-1405

Conflicts:
	ChangeLog
2014-05-23 20:21:41 +02:00
Laurent Destailleur
649fdd72dc Merge pull request #1622 from marcosgdf/bug-1410
Fix: [ bug #1410 ] Add customer order line asks for required Unit Price but doesn't interrupt the creation of the line
2014-05-23 20:20:22 +02:00
Laurent Destailleur
df35b4d2ea Merge branch 'marcosgdf-bug-1407' into 3.5 2014-05-23 20:18:38 +02:00
Laurent Destailleur
2771c506e9 Merge branch 'bug-1407' of github.com:marcosgdf/dolibarr into
marcosgdf-bug-1407

Conflicts:
	ChangeLog
2014-05-23 20:17:41 +02:00
Laurent Destailleur
31ea7117f0 Merge branch 'marcosgdf-bug-1411' into 3.5 2014-05-23 20:12:42 +02:00
Laurent Destailleur
d1ee20dd42 Merge branch 'bug-1411' of github.com:marcosgdf/dolibarr into
marcosgdf-bug-1411

Conflicts:
	ChangeLog
2014-05-23 20:11:13 +02:00
Laurent Destailleur
dc94b6e1bf Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-05-23 20:08:43 +02:00
Laurent Destailleur
1d01377dab Merge branch 'marcosgdf-bug-1397' into 3.5 2014-05-23 20:08:08 +02:00
Laurent Destailleur
9c398b14c5 Merge branch 'bug-1397' of github.com:marcosgdf/dolibarr into
marcosgdf-bug-1397

Conflicts:
	ChangeLog
2014-05-23 20:06:40 +02:00
Laurent Destailleur
20ec1e6ac8 Fix: Suppliers invoices must be visible if module supplier is on. 2014-05-23 19:55:40 +02:00
Laurent Destailleur
300e430024 Fix: If user already exists but permissions not set, it was not possible
to install Dolibarr.
2014-05-23 16:13:00 +02:00
Laurent Destailleur
95d8161dc1 Merge pull request #1623 from grandoc/3.5
avoid warning in commande.class.php if extrafields is used
2014-05-23 13:21:39 +02:00
Marcos García de La Fuente
fa733c8ba4 Fix: [ bug #1405 ] Rouget PDF expedition incorrect when two expeditions under the same commande 2014-05-23 11:42:14 +02:00
Philippe Grand
7acecadc79 avoid warning in commande.class.php if extrafields is used
avoid warning in commande.class.php if extrafields is used
2014-05-23 11:37:57 +02:00
Laurent Destailleur
2c05146778 Merge pull request #1621 from marcosgdf/bug-1388
Fix: [ bug #1388 ] Wrong date when invoicing several orders
2014-05-23 11:34:41 +02:00
Laurent Destailleur
43bf9ba890 Fix: Import of ical files was broken
Fix: Can import of ical files from BlueMind.
2014-05-23 04:28:57 +02:00
Marcos García de La Fuente
a705d4e333 Fix: [ bug #1410 ] Add customer order line asks for required Unit Price but doesn't interrupt the creation of the line 2014-05-23 03:00:46 +02:00