lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
109,623 Commits 43 Branches 150 Tags 886 MiB
develop
Commit Graph

139 Commits

Author SHA1 Message Date
aspangaro
c30728326e Merge remote-tracking branch 'Upstream/develop' into develop-bank 2015-12-04 12:41:51 +01:00
BENKE Charlie
46aaf9c270 Update 3.8.0-3.9.0.sql 2015-12-04 12:34:17 +01:00
Laurent Destailleur
055e650adf Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-12-02 23:23:38 +01:00
aspangaro
882b66c586 HRM - Add bank tab in user to pay salary or expense report 2015-12-01 06:56:26 +01:00
Laurent Destailleur
de730c9762 NEW Introduce cost price on product. 2015-11-30 21:20:45 +01:00
Laurent Destailleur
c55d11869b Billing of supplier or customer order is a process that can be done in 
parallel with shipment or reception, so we show the status on another
field into lists.
 2015-11-29 15:54:32 +01:00
Laurent Destailleur
9db71098ac Merge pull request #4031 from FHenry/develop 
PG SQL
 2015-11-21 01:50:47 +01:00
Laurent Destailleur
a906774595 Merge pull request #3979 from atm-alexis/3.9_NEW_add_billed_status_for_supplier_order 
NEW 3.9 add billed status for supplier order
 2015-11-21 00:20:17 +01:00
Laurent Destailleur
401b2a7389 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/theme/md/style.css.php
 2015-11-20 23:47:07 +01:00
Florian HENRY
fbe8a181a9 fix pgsql 2015-11-18 14:03:25 +01:00
Laurent Destailleur
735c7b7d68 Code comment 2015-11-18 13:57:01 +01:00
Florian HENRY
0ffc2a226c fix pg migration script 2015-11-18 13:53:04 +01:00
Laurent Destailleur
b1c5768de9 NEW Add fields into llx_cronjobs to be able to use job table to queue 
one shot jobs.
 2015-11-17 18:22:39 +01:00
Laurent Destailleur
6dc6bab556 Support of 'small', 'mini' and '' image size everywhere. 2015-11-17 10:38:00 +01:00
Laurent Destailleur
86db029cb3 Merge pull request #4013 from fappels/develop 
Fix migration - remove default for text field
 2015-11-17 10:06:07 +01:00
fappels
e9be3d19f4 Fix migration - remove default for text field 
remove default for user_param value text field
lang typo
 2015-11-16 21:24:08 +01:00
Alexis Algoud
55b23c4918 FIX add billed field in supplier order 2015-11-16 14:55:46 +01:00
fmarcet
9e51cf66dd New: Bolivian regions and departmens 2015-11-16 12:34:59 +01:00
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
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
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
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
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
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
Laurent Destailleur
91a2341e88 Add missing column 2015-10-17 03:32:19 +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
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
frederic34
7f86797f73 Add contact photo 2015-10-04 17:25:46 +02:00
Juanjo Menent
67d28d6991 Merge remote-tracking branch 'upstream/develop' into dolibarr-3509 
Conflicts:
	htdocs/install/mysql/migration/3.8.0-3.9.0.sql
 2015-10-03 14:59:56 +02:00
Laurent Destailleur
53269a2703 Removed old theme with no maintener. 2015-10-01 23:27:41 +02:00
Laurent Destailleur
fcf3a0966c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-10-01 23:19:58 +02:00
Laurent Destailleur
3f8b95de77 Work on default theme 2015-10-01 23:19:50 +02:00
Regis Houssin
259f7af3e6 Fix: missing llx_const encryption 2015-10-01 12:06:45 +02:00
Laurent Destailleur
c7e05d2473 Add field pass_crypted to uniformize fields between members and users. 2015-09-30 19:27:36 +02:00
Juanjo Menent
f14c806439 Merge branch 'develop' into dolibarr-3509 
Conflicts:
	htdocs/install/mysql/migration/3.8.0-3.9.0.sql
 2015-09-26 09:03:50 +02:00
Juanjo Menent
342e3413db Issue 3509: Init works 2015-09-23 22:48:48 +02:00
aspangaro
918c323f8f Salaries : Add info card / add field datec / rename field user_creat to user_author 2015-09-23 06:37:14 +02:00
Laurent Destailleur
81b447dd0f NEW Add color on categories 2015-09-17 19:51:56 +02:00
Laurent Destailleur
b1168d223a NEW Introduce table llx_overwrite_trans to be able to overwrite 
translations by simple database edition.
 2015-09-17 18:44:42 +02:00
Florian HENRY
6cb993c0b4 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-09-10 11:20:03 +02:00
aspangaro
393d528be7 Merge remote-tracking branch 'Upstream/develop' into develop-64 
Conflicts:
	htdocs/install/mysql/migration/3.8.0-3.9.0.sql
 2015-09-08 21:17:54 +02:00
aspangaro
cf869f22b5 Merge remote-tracking branch 'Upstream/develop' into develop-63 
Conflicts:
	htdocs/install/mysql/migration/3.8.0-3.9.0.sql
 2015-09-07 21:45:13 +02:00
aspangaro
5780d33f9b Merge remote-tracking branch 'Upstream/develop' into develop-64 
Conflicts:
	htdocs/install/mysql/migration/3.8.0-3.9.0.sql
 2015-09-06 22:00:52 +02:00
aspangaro
671018c5cc New Accountancy Uniformize code & rename a constant 2015-09-06 21:53:28 +02:00
Laurent Destailleur
77ef046af4 Start to mutualize the builddoc and remove_file action. 2015-09-06 14:02:21 +02:00
aspangaro
ef7df3f261 New: Accountancy rename llx_accountingaccount in llx_accounting_account 
Fix: language key
 2015-09-05 08:03:06 +02:00
aspangaro
e4bac2adfd Merge remote-tracking branch 'Upstream/develop' into develop-57 
Conflicts:
	htdocs/install/mysql/migration/3.8.0-3.9.0.sql
 2015-08-30 07:39:45 +02:00
aspangaro
134bd42c4e Increase length of column pcg_version to 32 2015-08-27 15:13:29 +02:00
Florian HENRY
3ae9515416 add column for import 2015-08-20 10:43:27 +02:00
aspangaro
bd69d37c3a New: Add number of expense reports to pay 2015-08-17 05:29:12 +02:00