Laurent Destailleur
1c8e1638c7
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-04-21 12:08:56 +02:00
Laurent Destailleur
a690276060
Fix js warnings, select2 css was not loaded.
2015-04-21 12:08:36 +02:00
Laurent Destailleur
e476b57795
Merge pull request #2678 from defrance69/patch-60
...
add tab management on salarie payement
2015-04-21 11:15:20 +02:00
Laurent Destailleur
9d1c609c4f
Merge pull request #2538 from marcosgdf/units
...
NEW [ task 977 ] New option to manage product unit Migrated code from GPCSolutions/dolibarr:3.2-units branch and adapted for 3.8 with some improvements
2015-04-21 11:14:50 +02:00
jfefe
f2d05ce754
Add missing value for object line type (product or service)
2015-04-20 16:20:04 +02:00
Laurent Destailleur
94589b9935
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-04-19 23:15:39 +02:00
Laurent Destailleur
65dafeee55
Uniformize feature between invoice and merging tool
2015-04-19 23:15:24 +02:00
Marcos García de La Fuente
2967bc7df7
Merge branch 'develop' into units
2015-04-19 17:19:59 +02:00
Marcos García de La Fuente
7be7a770c1
Implemented units for CommandeFournisseur and FactureFournisseur
2015-04-19 16:46:24 +02:00
BENKE Charlie
5a68cba013
Create salaries.lib.php
...
add lib salaries for menu management
2015-04-19 13:25:43 +02:00
Raphaël Doursenaud
e7a21de11d
Use minified select2 js lib
2015-04-19 12:58:47 +02:00
Juanjo Menent
9efdc09c32
Merge pull request #2674 from atm-maxime/develop
...
Fix : multi upload of files in document tabs
2015-04-19 10:03:27 +02:00
Maxime Kohlhaas
e692950627
Fix : multi upload of files in document tabs
2015-04-19 04:04:43 +02:00
jfefe
f5db4d5bb7
Fix: missing getEntity function
2015-04-19 03:05:37 +02:00
Laurent Destailleur
111b54d82c
Fix phpcs
2015-04-19 03:02:49 +02:00
Marcos García de La Fuente
270bca740c
Merge branch 'develop' into units
...
Conflicts:
htdocs/compta/facture/fiche-rec.php
2015-04-19 00:59:04 +02:00
Marcos García de La Fuente
15b1f03a08
Merge branch 'develop' into commercial-name
...
Conflicts:
htdocs/comm/list.php
htdocs/comm/prospect/list.php
htdocs/societe/consumption.php
htdocs/societe/soc.php
2015-04-19 00:48:07 +02:00
Maxime Kohlhaas
ee8b5be43b
Typo
2015-04-19 00:46:30 +02:00
Laurent Destailleur
5b29c87933
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/compta/deplacement/fiche.php
htdocs/core/tpl/objectline_create.tpl.php
htdocs/expedition/fiche.php
2015-04-19 00:23:46 +02:00
Marcos García de La Fuente
87f97ed545
Merge branch 'develop' into units
...
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/compta/facture.php
htdocs/install/mysql/migration/3.7.0-3.8.0.sql
htdocs/product/admin/product.php
htdocs/product/card.php
2015-04-18 23:38:14 +02:00
jfefe
3825b89ead
Change companies and product title picto
2015-04-18 23:13:48 +02:00
jfefe
c905f88498
Change generic and setup image title
2015-04-18 23:13:48 +02:00
Marcos García de La Fuente
e2e6049c7f
Copyright
2015-04-18 20:50:03 +02:00
Marcos García de La Fuente
c07e26dcac
Merge branch 'develop' into fr-2613
...
Conflicts:
htdocs/install/mysql/migration/3.7.0-3.8.0.sql
2015-04-18 20:42:57 +02:00
Marcos García de La Fuente
dc790ff586
NEW: Feature request: A page to merge two thirdparties into one #2613
2015-04-18 20:41:09 +02:00
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
Maxime Kohlhaas
7b035d3b5f
Fix : menu financial was not displayed when only supplier module is activated
2015-04-18 20:11:19 +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
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
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
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
Maxime Kohlhaas
51522decf3
Fix : price in editkeyval function was forcing a price rounding
2015-04-18 18:33:46 +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
Laurent Destailleur
873899a5d4
Merge pull request #2635 from FHenry/develop
...
fix typo
2015-04-18 17:45:25 +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
jfefe
fe01c4470d
Show tools menu when activating resource module
2015-04-18 15:04:44 +02:00
Juanjo Menent
f8a1bf9a10
Merge pull request #2621 from atm-maxime/develop
...
Remove debug trace
2015-04-18 14:49:23 +02:00
Florian HENRY
d3592c8d58
typo
2015-04-18 13:09:35 +02:00
