Commit Graph

47007 Commits

Author SHA1 Message Date
Laurent Destailleur
f7b2b00ebd Merge pull request #2650 from FHenry/dev_pdfpropalmergeproductpdf
NEW : Propal merge PDF product attached files (on option)
2015-04-18 20:18:57 +02:00
Laurent Destailleur
cb0e45d54b Merge pull request #2647 from aternatik/fix_css
Fix : css properties for lists and input fields
2015-04-18 20:05:10 +02:00
Laurent Destailleur
6e136616c6 Merge pull request #2649 from atm-maxime/develop
Alert when oustanding amount excedeed
2015-04-18 20:04:25 +02:00
Laurent Destailleur
6b934001e9 Merge pull request #2651 from aternatik/fix_email_template
Fix : bad usage of empty function with GETPOST
2015-04-18 20:03:55 +02:00
Maxime Kohlhaas
ecf1fbe5a7 Typo 2015-04-18 20:03:40 +02:00
jfefe
bee5af4d9e Fix : bad usage of empty function with GETPOST 2015-04-18 19:56:36 +02:00
Maxime Kohlhaas
c3bcda74f3 Fix : unit price without tax is now subprice (not pu_ht) 2015-04-18 19:17:05 +02:00
Florian HENRY
62ef9743ea Merge branch 'develop' into dev_pdfpropalmergeproductpdf 2015-04-18 19:16:33 +02:00
Juanjo Menent
c5d8fa4602 Fix: solves #2644 2015-04-18 19:14:30 +02:00
Florian HENRY
e704e03726 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-04-18 19:13:56 +02:00
Maxime Kohlhaas
2ddef9ffd9 Alert when oustanding amount excedeed 2015-04-18 19:08:44 +02:00
Maxime Kohlhaas
53469c803a Typo 2015-04-18 19:08:01 +02:00
jfefe
4f0829d4ea Adjust CSS : missing color for input, textarea and select list 2015-04-18 19:01:33 +02:00
Laurent Destailleur
e4656ecfd4 Merge pull request #2636 from defrance69/patch-59
NEW Add list of orders into commercial page
2015-04-18 18:58:06 +02:00
jfefe
c5b191d590 Adjust CSS properties for tables 2015-04-18 18:57:13 +02:00
Laurent Destailleur
07bf403354 Merge pull request #2645 from atm-maxime/develop
Fix : outstanding limit was not saved
2015-04-18 18:49:53 +02:00
Maxime Kohlhaas
8e4771daa0 Fix : outstanding limit was not saved 2015-04-18 18:48:50 +02:00
Laurent Destailleur
e1403b136c Merge pull request #2639 from aternatik/stable_resource
New : mark resource module as stable
2015-04-18 18:48:24 +02:00
Florian HENRY
db2acb7ced Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-04-18 18:47:19 +02:00
Laurent Destailleur
97fe909278 Merge pull request #2642 from GPCsolutions/editorconfig
Dolibarr uses tab indents
2015-04-18 18:46:46 +02:00
Laurent Destailleur
3edfbf1a67 Merge pull request #2637 from grandoc/develop
fix syntax errors
2015-04-18 18:46:19 +02:00
Florian HENRY
e15d4c045d NEW : Propal merge product card PDF into azur 2015-04-18 18:44:05 +02:00
philippe grand
838329f3d9 Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop 2015-04-18 18:36:00 +02:00
Raphaël Doursenaud
81a14b5bfd Dolibarr uses tab indents 2015-04-18 18:27:26 +02:00
jfefe
5c4633d538 New : mark resource module as stable 2015-04-18 18:18:21 +02:00
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
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
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
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
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
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