Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-09 02:58:23 +01:00
Code Issues Packages Projects Releases Wiki Activity
53,283 Commits 36 Branches 190 Tags
fb53b41078fbe9cb15cf4c3501729a3747a580b0
Commit Graph

1424 Commits

Author SHA1 Message Date
Laurent Destailleur
6bd6be0912 Debug and rename experimental module "supplier proposal". Still work to 
do: Must fix the PDF to be compliant with a request quotation to a
supplier (so no need to show vat, unit price, ...).
 2015-11-15 19:23:39 +01:00
Laurent Destailleur
01058be44c NEW Introduce a "code" into fiels to describe vat. This will allow to 
suggest different vat lines with same value with ability to
differentiate them.
 2015-11-14 17:53:58 +01:00
Laurent Destailleur
ab177b43af Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	ChangeLog
	htdocs/.gitignore
	htdocs/comm/mailing/card.php
	htdocs/commande/list.php
	htdocs/compta/facture.php
	htdocs/expedition/class/expedition.class.php
 2015-11-13 12:35:10 +01:00
Frédéric FRANCE
bab41e40e7 Update 3.8.0-3.9.0.sql 2015-11-12 17:50:52 +01:00
aspangaro
05b0ab2eab HRM: Add fk_establishment in llx_user to link an user to an establishment 2015-11-11 15:45:55 +01:00
Laurent Destailleur
f49fab8a7e Rename some files in english and increase fields size. 2015-11-09 16:48:30 +01:00
Laurent Destailleur
bd56396394 Fix migration error 2015-11-08 15:38:57 +01:00
Laurent Destailleur
fa8863d2ea Fix sql migration requests 2015-11-08 01:38:03 +01:00
Florian HENRY
a4fafae109 FIX : Remove column creation for table llx_product_fournisseur_price, 
the column use un calss is fk_supplier_price_expression, and
fk_price_expression does not exist into lx_product_fournisseur_price sql
file declaration
 2015-11-07 17:19:13 +01:00
Laurent Destailleur
09fb87e47d Prepare tables for categories/tags on projects. Looking for a dev to 
implement categories/tags on projects !
 2015-11-07 11:40:31 +01:00
Laurent Destailleur
b2d9f21253 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-11-06 18:57:46 +01:00
Florian HENRY
28b229c83a FIX: #3916 2015-11-06 11:24:52 +01:00
Laurent Destailleur
11f0cad2ab FIX #3912 2015-11-06 11:22:50 +01:00
Florian HENRY
d3d62f7db5 FIX: #3913 2015-11-06 11:11:23 +01:00
Florian HENRY
b0be2b04c7 FIX : #3912 2015-11-06 10:53:33 +01:00
Florian HENRY
f6b8c3a130 FIX : #3912 2015-11-06 10:50:08 +01:00
Laurent Destailleur
e26940ddf7 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/core/lib/admin.lib.php
	htdocs/core/modules/DolibarrModules.class.php
	htdocs/fourn/ajax/getSupplierPrices.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/install/filelist.xml
	htdocs/install/mysql/migration/3.8.0-3.9.0.sql
	htdocs/societe/price.php
 2015-11-05 01:50:30 +01:00
Laurent Destailleur
81f0b516b9 Prepare module opensurvey for 'Form' type. 2015-11-04 11:08:46 +01:00
Laurent Destailleur
826cc6db1b Repair old deprecated data 2015-11-04 09:54:13 +01:00
Laurent Destailleur
8f2fb3cbee Merge pull request #3845 from frederic34/patch-19 
Remove incomplete llx_stock_lotserial migration
 2015-11-02 10:43:55 +01:00
Juanjo Menent
a58b5f26f6 Merge pull request #3774 from marcosgdf/multiprice-generator 
NEW Level multiprice generator based on per cent variations over base price
 2015-10-31 23:03:19 +01:00
Marcos García de La Fuente
592348850f Added missing SQL statements + reordered them 2015-10-31 11:48:17 +01:00
Marcos García de La Fuente
e1f2efee4d Merge branch 'develop' into multiprice-generator 
# Conflicts:
#	htdocs/install/mysql/migration/3.8.0-3.9.0.sql
 2015-10-31 11:46:14 +01:00
Frédéric FRANCE
f3f83fa6c1 Remove incomplete llx_stock_lotserial migration 
There is two creation of this table in migration script, keeping the more complete
 2015-10-31 10:32:41 +01:00
Frédéric FRANCE
4108f55c1e Update 3.8.0-3.9.0.sql 2015-10-31 10:07:13 +01:00
Maxime Kohlhaas
59714e4b32 Fix : migration wrong index 2015-10-30 12:41:36 +01:00
Laurent Destailleur
6cc3df7e71 NEW Quick searh filter works on invoice, proposal, order, intervention, 
contract
 2015-10-30 08:35:56 +01:00
Laurent Destailleur
2b5746aec3 Add field position into some dictionaries tables 2015-10-29 21:25:18 +01:00
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
07b277b23f Prepare fields in dtabase to store if time spent was invoiced or not. 2015-10-26 15:22:33 +01:00
Laurent Destailleur
016dbd39ee Fix sql phpunit regression 2015-10-23 15:24:47 +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
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