Laurent Destailleur
3588d73c8e
Fix css
2015-05-31 16:36:11 +02:00
Laurent Destailleur
1b681510a5
NEW Use new select2 component for juridical status, country and state
...
selection.
2015-05-31 12:25:33 +02:00
Laurent Destailleur
01aad8516d
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/adherents/list.php
htdocs/compta/dons/card.php
htdocs/compta/dons/class/don.class.php
htdocs/contact/list.php
htdocs/contrat/list.php
htdocs/core/class/html.form.class.php
htdocs/core/lib/security.lib.php
htdocs/main.inc.php
htdocs/product/stock/massstockmove.php
htdocs/public/test/test_arrays.php
htdocs/public/test/test_forms.php
htdocs/societe/societe.php
2015-05-31 03:30:38 +02:00
Laurent Destailleur
49f2157f2d
Little debug of module resource
2015-05-31 02:05:39 +02:00
Laurent Destailleur
5e773d4cb6
Work on finishing of style
2015-05-31 01:06:51 +02:00
Laurent Destailleur
7a0ec2d831
Prototype with datatables works now also ith jmobile.
...
Add field fifo and lifo into product table.
2015-05-30 23:56:42 +02:00
Laurent Destailleur
36b7f1dcf3
NEW Show photo of logged user into login top right block.
...
NEW If no photo is available for user, we show a generic photo depending
on gender
2015-05-30 19:50:07 +02:00
Laurent Destailleur
0b372a4017
Use a dedicated icon instead of generic one
2015-05-30 17:32:50 +02:00
Laurent Destailleur
bfe85cbf37
Better error management
2015-05-30 16:14:54 +02:00
Laurent Destailleur
7f352e5b24
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-05-30 15:21:56 +02:00
Laurent Destailleur
b14b1c1b12
Use dedicated picto
2015-05-30 15:21:48 +02:00
Laurent Destailleur
03c06b3cf8
Merge pull request #2916 from aspangaro/develop-patch23
...
FIX: export salaries & NEW: Add tab document on salaries payment
2015-05-30 15:09:23 +02:00
Laurent Destailleur
13b78f9c17
NEW Add gender property managed on user card
...
FIX Better error messages when uploading photo of user when permission
to write are not granted
2015-05-30 02:17:05 +02:00
Raphaël Doursenaud
bbd0b89087
Added tags/categories management to customers
...
Customers part of #2571
2015-05-29 18:50:43 +02:00
Laurent Destailleur
888bec2df3
Merge pull request #2904 from fappels/develop
...
FIX #2859 HTML units selector
2015-05-29 17:21:32 +02:00
Laurent Destailleur
0ab3cd03c0
Merge pull request #2896 from GPCsolutions/extrafieldcontacttype
...
Allow usage of contact extrafield element type
2015-05-29 17:18:25 +02:00
Laurent Destailleur
58dbfd38a9
Merge pull request #2926 from hregis/develop_origin
...
Fix: possibility to shared facnumber between entities
2015-05-29 17:16:02 +02:00
Laurent Destailleur
11552e90b7
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-05-29 17:15:27 +02:00
Laurent Destailleur
65c7ab7a93
Fix: Introduce error by default when function is used as a true delete
...
function.
2015-05-29 17:11:42 +02:00
Laurent Destailleur
d925ecb4f1
Revert "Made test pessimistic by default"
2015-05-29 17:09:35 +02:00
Laurent Destailleur
eb62c7e462
Merge pull request #1446 from GPCsolutions/removefiles
...
Made test pessimistic by default
2015-05-29 16:56:28 +02:00
Alexis Algoud
dd7febe2b9
replace test by getEntity()
2015-05-29 15:10:59 +02:00
Regis Houssin
c8c0f0f038
Fix: possibility to shared facnumber between entities
2015-05-29 11:31:51 +02:00
Regis Houssin
49fc7f9ba7
Fix: check the user status during authentication
2015-05-29 10:09:18 +02:00
Regis Houssin
131c3fcef8
Fix: check the user status during authentication
2015-05-29 10:07:48 +02:00
aspangaro
0bd07b795f
NEW: Add tab document on salaries payment
2015-05-28 07:33:50 +02:00
aspangaro
d3513bf2a7
Fix: lot of typo to export salaries
2015-05-28 06:41:01 +02:00
aspangaro
58893a4576
Fix: problem of rights to export salaries
2015-05-28 06:26:28 +02:00
Francis Appels
b9c3dec141
Fix: issue #2859 unit form select
2015-05-26 11:14:15 +02:00
Laurent Destailleur
76380c2288
Merge pull request #2898 from defrance69/patch-62
...
Tabs collector better identification
2015-05-25 19:27:39 +02:00
Laurent Destailleur
0321257fbe
Merge pull request #2887 from GPCsolutions/dolibarr-2886
...
Deprecation of the mysql driver
2015-05-25 18:50:40 +02:00
Laurent Destailleur
a4164a6656
Merge pull request #2883 from bafbes/develop
...
Fix non existing "supplier invoice setting to draft" trigger
2015-05-25 18:49:57 +02:00
Laurent Destailleur
c2decc8aea
Merge pull request #2895 from atm-ph/fix_37_balise_script
...
FIX : "script" balise with wrong syntax
2015-05-25 18:49:15 +02:00
Laurent Destailleur
c8949d0532
Some doxygen fixes
2015-05-25 18:43:46 +02:00
BENKE Charlie
a30d4d4be6
Tabs collector better identification
...
Tabs collector goes wrong with 2 tabs in the same page (like projet and task), so we use picto name to identify the 2 tabscollect
We need to substract the @ if the tabs is from a module... eg : factory@factory
2015-05-25 18:14:49 +02:00
Laurent Destailleur
11d4a945b0
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/adherents/liste.php
htdocs/comm/propal.php
htdocs/compta/facture.php
htdocs/contact/list.php
htdocs/contrat/liste.php
htdocs/product/liste.php
2015-05-25 18:08:23 +02:00
Raphaël Doursenaud
ec2035a73e
Allow usage of contact extrafield element type
...
As documented in the methods comments
2015-05-25 17:19:27 +02:00
phf
33ad86261a
FIX : width multiselect
2015-05-25 16:42:51 +02:00
Marcos García de La Fuente
460a2ec2ab
Merge branch 'develop' into commercial-name
...
Conflicts:
htdocs/categories/categorie.php
htdocs/comm/prospect/list.php
2015-05-25 15:09:46 +02:00
Steve Braun
d1c7c9489e
fixes #2847
2015-05-25 14:56:37 +02:00
Juanjo Menent
5ddcfce908
Merge pull request #2890 from GPCsolutions/categories-types
...
Include Categories class whenever Categorie::TYPE is used
2015-05-24 11:38:09 +02:00
Raphaël Doursenaud
becc240b92
Include Categories class whenever Categorie::TYPE is used
2015-05-23 23:35:49 +02:00
Raphaël Doursenaud
c018858e91
Deprecation of the mysql driver
...
Fix #2886
2015-05-23 20:43:21 +02:00
Juanjo Menent
55b7dab292
Merge pull request #2884 from GPCsolutions/categories-types
...
Added types constants to categories
2015-05-23 19:09:07 +02:00
Raphaël Doursenaud
ee808cdfd7
Added types constants to categories
2015-05-23 18:52:31 +02:00
Raphaël Doursenaud
139b41c014
Make select_salesrepresentative() return 0 when empty
...
Fix #2881
2015-05-23 16:38:59 +02:00
abb
879c82ee0a
added new trigger for supplier invoice unvalidation "BILL_SUPPLIER_UNVALIDATE" in trigger demo file
2015-05-23 15:28:51 +01:00
abb
ba68598ec7
added new trigger for supplier invoice unvalidation in Agenda
2015-05-23 15:09:44 +01:00
Alexis Algoud
91885c9d6f
FIX when multicompany was enabled, this function didn't check just on the good entity (problem when both company use same mask)
2015-05-22 17:22:57 +02:00
Laurent Destailleur
390c7d8e65
Fix link to prospect with filter on commercial status
...
Enhance natural_search method to allow to search on several ids.
2015-05-22 15:19:27 +02:00
