Laurent Destailleur
282972784e
Prepare table for budget lines
2015-10-29 19:18:41 +01:00
Laurent Destailleur
8f52d426d0
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/install/mysql/migration/3.8.0-3.9.0.sql
2015-10-28 22:08:28 +01:00
Laurent Destailleur
8c84ce1576
Create table llx_stock_serial. This table may be used to store eatby and
...
sellby date for a couple product-batch number in one place only.
2015-10-28 22:05:37 +01:00
Marcos García de La Fuente
eff1f73950
Merge branch 'develop' into multiprice-generator
...
# Conflicts:
# htdocs/install/mysql/migration/3.8.0-3.9.0.sql
# htdocs/product/price.php
2015-10-27 10:41:50 +01:00
aspangaro
b90c56fbb5
HRM : move migration into 3.8 to 3.9
2015-10-27 06:29:18 +01:00
Laurent Destailleur
24c3491ff7
Code comment
2015-10-26 22:56:54 +01:00
Laurent Destailleur
07b277b23f
Prepare fields in dtabase to store if time spent was invoiced or not.
2015-10-26 15:22:33 +01:00
Laurent Destailleur
1f1e72f2b6
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/compta/facture/list.php
htdocs/core/class/html.form.class.php
htdocs/core/lib/functions.lib.php
htdocs/filefunc.inc.php
htdocs/fourn/facture/list.php
htdocs/main.inc.php
2015-10-25 19:54:41 +01:00
Laurent Destailleur
2cbfb69f9b
Update template
2015-10-23 15:28:14 +02:00
Laurent Destailleur
016dbd39ee
Fix sql phpunit regression
2015-10-23 15:24:47 +02:00
Sergio Sanchis Climent
2a412af00b
Fix: Bug: if $this->employe no exist
...
Fix: if this->employee no exist default 0
2015-10-23 13:04:33 +02:00
Laurent Destailleur
633055fe5b
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-10-22 19:44:00 +02:00
Laurent Destailleur
1000fd1b21
Add field employee for hr module
2015-10-22 19:43:50 +02:00
Laurent Destailleur
8df59134a9
Merge pull request #3705 from aspangaro/develop-hrm
...
New : Module HRM
2015-10-22 19:15:49 +02:00
Laurent Destailleur
cac4a85ccd
Merge pull request #3788 from atm-maxime/new_customer_recap
...
New customer recap
2015-10-22 18:02:38 +02:00
Laurent Destailleur
3d7050e051
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-10-22 12:29:35 +02:00
Laurent Destailleur
9cbb9129c2
FIX #3772
2015-10-22 12:29:24 +02:00
Laurent Destailleur
ce681081c1
Merge pull request #3776 from frederic34/patch-15
...
Set warehouse for order
2015-10-22 12:16:40 +02:00
Laurent Destailleur
40adaf716d
Uniformize index names
2015-10-22 10:33:42 +02:00
Laurent Destailleur
4453ba53fd
Fix migration error
2015-10-22 10:28:59 +02:00
Frédéric FRANCE
6a524eeabb
Update 3.8.0-3.9.0.sql
2015-10-19 21:04:05 +02:00
Frédéric FRANCE
1d9f9c7f5b
Update llx_commande.sql
2015-10-19 21:00:47 +02:00
Frédéric FRANCE
2264ecfb2c
Update llx_commande.sql
2015-10-19 20:58:36 +02:00
Maxime Kohlhaas
a953a66616
New : allow to define list size for object list on customer card
2015-10-19 19:05:04 +02:00
Laurent Destailleur
ec04306348
Fix #3772 Test lower value to avoid mysql limit
2015-10-19 18:31:38 +02:00
Marcos García de La Fuente
e7e152c122
NEW Level multiprice generator based on per cent variations over base price
2015-10-19 15:13:19 +02:00
Laurent Destailleur
dcf7d344cd
Prepare database for future portal website
2015-10-19 12:54:22 +02:00
Laurent Destailleur
b9001d7ab8
NEW Prepare database to store information per files (for example to
...
define if an image ca, be used as a cover or not)
2015-10-18 22:43:19 +02:00
Laurent Destailleur
d0e590f8ea
Move variables
2015-10-18 20:56:10 +02:00
aspangaro
aac88519de
Merge remote-tracking branch 'Upstream/develop' into develop-hrm
...
Conflicts:
htdocs/user/card.php
2015-10-17 07:19:46 +02:00
Laurent Destailleur
91a2341e88
Add missing column
2015-10-17 03:32:19 +02:00
Laurent Destailleur
b3491ef4e5
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
ChangeLog
htdocs/comm/propal/class/propal.class.php
htdocs/compta/facture/admin/facture_cust_extrafields.php
htdocs/compta/facture/admin/facturedet_cust_extrafields.php
htdocs/compta/facture/class/facture.class.php
htdocs/contrat/card.php
2015-10-16 10:12:36 +02:00
Laurent Destailleur
577776b950
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-10-15 12:19:01 +02:00
Laurent Destailleur
e2478eea07
NEW Increase length of bank code to 128 char #3704
2015-10-15 12:18:17 +02:00
Laurent Destailleur
7fe92bdf0a
Merge pull request #3722 from GPCsolutions/zenfusion-23
...
[Qual] Use default data root path if no conf
2015-10-15 12:06:04 +02:00
Laurent Destailleur
7f75a3da9d
NEW On list of thirdparties, user can select fields to show.
...
Make phpunit test working again localy.
Add missing columns into llx_expedition.
2015-10-15 03:29:35 +02:00
Laurent Destailleur
e9aed15bed
Work on the feature to select which field to show
2015-10-14 18:48:03 +02:00
Raphaël Doursenaud
ddb23eaf3b
[Qual] Use default data root path if no conf
...
Installation can be protected by an install.lock file in the
data root path. This protection was ineffective if no configuration
file was available. Whith this change, it still searches the default
path.
2015-10-12 15:25:36 +02:00
Laurent Destailleur
1acaf44acf
Merge pull request #3718 from hregis/3.8_bug
...
Fix: wrong files name
2015-10-11 19:48:25 +02:00
Laurent Destailleur
a9a3c3b97f
Exclude file from sources. It is generated when building package.
2015-10-11 19:47:47 +02:00
Laurent Destailleur
a8e52f9c54
Update filelist
2015-10-11 19:45:53 +02:00
Regis Houssin
f8f600828d
Fix: wrong files name
2015-10-11 19:18:03 +02:00
aspangaro
8b97196c2f
Correct term status & sql error
2015-10-10 08:50:55 +02:00
aspangaro
5d7e05e313
Correct review
2015-10-10 06:00:55 +02:00
aspangaro
f6947afc2f
Merge remote-tracking branch 'Upstream/develop' into develop-hrm
2015-10-10 05:42:06 +02:00
Raphaël Doursenaud
b785db86a8
Fix unittests regression
...
Introduced by incomplete renaming
of modSyncSupplierWebServices to modWebServicesClient
in 4b103ba8ce
2015-10-09 19:02:44 +02:00
aspangaro
bde7279aa1
Review by Rdoursenaud. Tkanks
2015-10-09 13:00:51 +02:00
aspangaro
b571cc86ff
Add a yn form in user card to know if the user is also an employee
2015-10-09 07:30:48 +02:00
aspangaro
6a7892ca52
Add the first tables
2015-10-09 06:41:36 +02:00
Laurent Destailleur
4b103ba8ce
Work on a better way to manage modules. All one page. Introduce a way to
...
choose order of modules family. We should also be able to introduce
filters.
2015-10-07 08:13:23 +02:00
