2
0
forked from Wavyzz/dolibarr
Commit Graph

5117 Commits

Author SHA1 Message Date
atm-greg
d809c017ca Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into test_pgsql_installation 2019-03-20 06:10:53 +01:00
Laurent Destailleur
9a3c66b057 Merge pull request #10846 from grandoc/new_branch_15_03_2019
New branch 15 03 2019
2019-03-19 12:13:02 +01:00
Laurent Destailleur
1a8902f23e Fix migration for compatibility 2019-03-19 12:03:02 +01:00
Laurent Destailleur
6970d066f8 Better compatibility 2019-03-19 11:23:38 +01:00
Laurent Destailleur
a4372e24bf Migration 2019-03-19 11:21:55 +01:00
Laurent Destailleur
77b675bec1 Merge pull request #10876 from ptibogxiv/patch-143
FIX support duration/time units with services
2019-03-19 11:20:13 +01:00
Laurent Destailleur
81fb18befe Complete unit table 2019-03-19 11:19:46 +01:00
wdammak
56bee8a20f Update llx_product.key.sql 2019-03-18 20:23:45 +01:00
wdammak
cf0bc88601 Update llx_product.sql 2019-03-18 20:19:30 +01:00
ptibogxiv
eb196ba8e6 Update 9.0.0-10.0.0.sql 2019-03-18 14:25:13 +01:00
ptibogxiv
9178939fe6 ADD week, month, year 2019-03-18 14:21:36 +01:00
ptibogxiv
030048db28 FIX compatibility of minute with php unit value 2019-03-18 14:07:31 +01:00
atm-ph
466a5e2e81 Fix postgreSQL migration 2019-03-18 10:47:56 +01:00
Maxime Kohlhaas
0a0e29a089 New fields on user object for hrm purpose 2019-03-16 08:53:06 +01:00
wdammak
5ee749c19d Update 9.0.0-10.0.0.sql 2019-03-15 20:46:38 +01:00
wdammak
c9f89f3854 Add fk_project to product table
Prepare the generation of a product from a project.
2019-03-15 20:28:28 +01:00
Laurent Destailleur
bca18f22ae Prepare link with expense report line and document 2019-03-15 16:23:38 +01:00
Philippe GRAND
2e4bf72382 update with html5 compliant code 2019-03-15 09:45:48 +01:00
Philippe GRAND
3d93fba4b8 update with html5 compliant code 2019-03-15 09:45:01 +01:00
Philippe GRAND
404872298f update with html5 compliant code 2019-03-15 09:44:17 +01:00
Philippe GRAND
f028f74c7c update with html5 compliant code 2019-03-15 09:43:33 +01:00
Laurent Destailleur
8f65ee2296 Merge branch 'develop' into NEW_develop_supplier_buyprice_barcode 2019-03-14 17:48:44 +01:00
Laurent Destailleur
7e31e6b4f6 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/notify.class.php
2019-03-13 19:30:25 +01:00
Laurent Destailleur
c32551cb62 Fix size of varchar 2019-03-13 13:42:14 +01:00
Laurent Destailleur
88c02143fa Fix missing fields 2019-03-13 13:40:57 +01:00
Laurent Destailleur
6ae36ce6a7 Work on BOM 2019-03-12 19:20:01 +01:00
Laurent Destailleur
f356d534cd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-03-11 17:48:03 +01:00
Laurent Destailleur
9c8aff0a28 FIX #10787 2019-03-11 17:47:53 +01:00
Laurent Destailleur
def8e770ca Fix name of indexes 2019-03-11 17:47:19 +01:00
wdammak
fa3246e70b Missing index to improve the performance of product/variants display 2019-03-10 03:09:23 +01:00
wdammak
0241b0d4ee Missing index to improve the performance of product/variants display
https://github.com/Dolibarr/dolibarr/issues/10787
2019-03-10 03:05:15 +01:00
Laurent Destailleur
10b9fdc1fd Fix column definition 2019-03-09 02:05:28 +01:00
Laurent Destailleur
f54eb78260 NEW Show the latest date of subscription in member statistics reports 2019-03-07 12:22:24 +01:00
Laurent Destailleur
a426c8e9bf Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/admin/system/filecheck.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/filefunc.inc.php
	htdocs/install/upgrade2.php
	htdocs/product/class/product.class.php
2019-03-07 11:16:24 +01:00
Laurent Destailleur
e67890bd22 NEW Can enter price with or without tax when entering expense repor line 2019-03-07 11:09:04 +01:00
Laurent Destailleur
1b0aec0847 Complete fields for template invoices 2019-03-06 20:51:07 +01:00
Laurent Destailleur
0c2a0c643b NEW Performance enhancement: Replace dirname(__FILE__) with __DIR__ 2019-03-06 14:33:05 +01:00
Laurent Destailleur
c06d2f6c3b Remove warning 2019-03-05 18:22:03 +01:00
Laurent Destailleur
925def5390 Work on BOM module 2019-03-04 13:37:00 +01:00
Laurent Destailleur
2448d1deaa fk_projet -> fk_project 2019-02-27 15:32:18 +01:00
atm-quentin
1b9a2e5cfc FIX migration 9 to 10 2019-02-27 09:27:15 +01:00
atm-quentin
f51b89def3 NEW supplier buyprice barcode 2019-02-27 09:22:34 +01:00
Laurent Destailleur
014c199173 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/core/tpl/extrafields_list_print_fields.tpl.php
2019-02-27 01:28:12 +01:00
Laurent Destailleur
6373e1db84 Merge branch 'develop' into 10.0_linkedin 2019-02-27 01:16:21 +01:00
Laurent Destailleur
9e82c37963 WIP Start module BOM 2019-02-26 19:27:04 +01:00
Laurent Destailleur
3ba69fc93a Fix missing ; after sql request 2019-02-25 15:06:55 +01:00
Laurent Destailleur
1be1ee1670 Remove duplicate record 2019-02-25 14:56:28 +01:00
Laurent Destailleur
c0be66b5e5 FXI Remove duplicate record before trying to create unique key 2019-02-25 14:55:29 +01:00
Alexandre SPANGARO
2da1447a0b Merge remote-tracking branch 'upstream/develop' into 10.0_linkedin 2019-02-25 09:12:04 +01:00
Alexandre SPANGARO
acb9cfe07a NEW: Add LinkedIn field 2019-02-25 09:07:58 +01:00