Commit Graph

40771 Commits

Author SHA1 Message Date
Laurent Destailleur
08dfcf3afc Merge 2015-04-18 18:14:55 +02:00
jfefe
f2e19f2326 Fix: error when deleting resource 2015-04-18 18:07:59 +02:00
philippe grand
eaf0fda6aa fix syntax errors 2015-04-18 18:07:41 +02:00
Laurent Destailleur
ca05c9a26f Fix PHPCS 2015-04-18 18:07:36 +02:00
Maxime Kohlhaas
8b307aac56 Fix : customer outstanding was not calculated properly 2015-04-18 18:06:27 +02:00
Maxime Kohlhaas
e0af2feced Fix : on impayees remain to pay did not include deposits 2015-04-18 18:06:02 +02:00
faust
4bb83de146 en_US: fix lang 2015-04-18 18:03:40 +02:00
BENKE Charlie
c9aaf51627 Update index.php
add last orders in commercial index page
2015-04-18 17:49:48 +02:00
Laurent Destailleur
873899a5d4 Merge pull request #2635 from FHenry/develop
fix typo
2015-04-18 17:45:25 +02:00
Laurent Destailleur
e7505e49cf Merge pull request #2623 from GPCsolutions/pear_mail_mime
Update PEAR Mail_MIME to 1.8.9
2015-04-18 17:44:30 +02:00
Laurent Destailleur
471a5857d2 Fix CSS 2015-04-18 17:42:24 +02:00
Florian HENRY
bbed849911 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-04-18 17:37:49 +02:00
Florian HENRY
b7191a541c All send email card works with model choice box 2015-04-18 17:15:36 +02:00
Laurent Destailleur
69b9de08b8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-04-18 16:54:20 +02:00
Laurent Destailleur
ce81f58986 Fix several bugs into edit of supplier lines 2015-04-18 16:54:00 +02:00
Florian HENRY
cc887ceff3 fix typo 2015-04-18 16:45:45 +02:00
faust
b7fb3d7d9e en_US: 'opened' is not an adjective... 2015-04-18 16:39:57 +02:00
jean
8006edc278 correct issue 2589 getting user signature in script, when user is sended
through a script parameter
2015-04-18 16:39:53 +02:00
bafbes
4c8dc1ba5b NEW : dev feature : replace conf filename with "conf" parameter on url by GET 2015-04-18 15:26:33 +01:00
faust
fb57cced55 en_US: fix typos and errors 2015-04-18 16:04:48 +02:00
faust
9a3b5305fe fix duplicate lines 2015-04-18 15:35:19 +02:00
Laurent Destailleur
a5ba7c664e Merge pull request #2627 from FHenry/develop
NEW : Email template choose on thirdparty card
2015-04-18 15:24:46 +02:00
Laurent Destailleur
8cd22ae6c8 Merge pull request #2631 from fappels/develop
FIX lang
2015-04-18 15:11:50 +02:00
Laurent Destailleur
7c8bb14fe4 Merge pull request #2628 from marcosgdf/bug-2579
Fix Bug #2579: Bad display duration enter data on intervention
2015-04-18 15:11:32 +02:00
Marcos García de La Fuente
d6a2d972a6 Fix: [ bug #2601 ] Supplier orderstoinvoice does not work with PostgreSQL 2015-04-18 15:07:19 +02:00
Laurent Destailleur
246c8a01a6 Merge pull request #2611 from defrance69/patch-58
Update paiement.class.php
2015-04-18 15:05:16 +02:00
jfefe
fe01c4470d Show tools menu when activating resource module 2015-04-18 15:04:44 +02:00
Juanjo Menent
459737e171 Merge pull request #2625 from marcosgdf/bug-2601
Fix bug #2601 Supplier orderstoinvoice does not work with PostgreSQL
2015-04-18 15:03:01 +02:00
Marcos García de La Fuente
401c0584e5 Fix: [ bug #2598 ] Untranslated "Supplier" tab name and some tax inputs in /fourn/card.php 2015-04-18 14:59:19 +02:00
Juanjo Menent
5203d5ead0 Merge pull request #2626 from marcosgdf/bug-2598
Fix bug #2598 Untranslated "Supplier" tab name and some tax inputs in /fourn/card.php
2015-04-18 14:58:25 +02:00
Juanjo Menent
f8a1bf9a10 Merge pull request #2621 from atm-maxime/develop
Remove debug trace
2015-04-18 14:49:23 +02:00
Juanjo Menent
2f8ed32f76 Fix: Issues if strict mode option ONLY_FULL_GROUP_BY is activated 2015-04-18 14:17:00 +02:00
Juanjo Menent
d3f24dab0a Fix: Issues if strict mode option ONLY_FULL_GROUP_BY is activated 2015-04-18 13:36:47 +02:00
Florian HENRY
d3592c8d58 typo 2015-04-18 13:09:35 +02:00
Francis Appels
d6fc0aa7b5 FIX lang 2015-04-18 11:42:38 +02:00
Juanjo Menent
dc74302985 Fix: Issues if strict mode option ONLY_FULL_GROUP_BY is activated 2015-04-18 11:32:01 +02:00
Marcos García de La Fuente
de494b2904 Fix Bug #2579: Bad display duration enter data on intervention 2015-04-18 11:25:15 +02:00
Maxime Kohlhaas
2b8efc302a Fix : shipment model selection 2015-04-18 11:24:55 +02:00
Florian HENRY
6391fd0c40 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-04-18 11:07:07 +02:00
Florian HENRY
3d8a7ee179 Start email template selector 2015-04-18 11:06:53 +02:00
Marcos García de La Fuente
b5ed65f838 Fix: [ bug #2598 ] Untranslated "Supplier" tab name and some tax inputs in /fourn/card.php 2015-04-18 10:50:07 +02:00
Maxime Kohlhaas
1fa43379c9 Merge branch 'develop' of github.com:atm-maxime/dolibarr into develop 2015-04-18 10:43:11 +02:00
Marcos García de La Fuente
9fee7a9827 Fix: [ bug #2601 ] Supplier orderstoinvoice does not work with PostgreSQL 2015-04-18 10:30:58 +02:00
Maxime Kohlhaas
7aba52c810 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2015-04-18 10:29:43 +02:00
Raphaël Doursenaud
e8332cc724 Update PEAR Mail_MIME to 1.8.9
This is nusoap dependency and the unkown previous version
was GPL incompatible and used deprecated functions.
2015-04-18 04:27:15 +02:00
Maxime Kohlhaas
7223495ac2 Fix : date_delivery was not a datetime 2015-04-18 04:21:16 +02:00
Laurent Destailleur
deb62f1ffd Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
	htdocs/core/class/html.formother.class.php
	htdocs/core/lib/ajax.lib.php
	htdocs/expedition/list.php
2015-04-18 04:18:59 +02:00
Maxime Kohlhaas
07fd6a3ae7 Fix : delivery date was not a datetime 2015-04-18 04:18:40 +02:00
Maxime Kohlhaas
e6c5b234fc Remove debug trace 2015-04-18 03:54:33 +02:00
Laurent Destailleur
aab9b0ec60 Merge pull request #2620 from atm-maxime/develop_cat_multiselect
New : categories as multi-select on product
2015-04-18 03:53:05 +02:00