Commit Graph

3610 Commits

Author SHA1 Message Date
Laurent Destailleur
87d073b5cd Fix conflict with external ticketsup module 2018-06-04 21:49:29 +02:00
Philippe GRAND
909fa496e5 clean and update code 2018-06-04 17:37:17 +02:00
Laurent Destailleur
69dd11f7c6 Fix: Must use a standard (internationnal) date format. 2018-06-04 14:05:47 +02:00
Laurent Destailleur
eca66492ce Merge pull request #8913 from aspangaro/8.0-a26
NEW : Accountancy Add import on general ledger
2018-06-04 14:02:34 +02:00
Alexandre SPANGARO
a3030e4057 Update works 2018-06-03 22:35:39 +02:00
Inovea Conseil
78b3067de3 NEW: ADD admin page for modulebuilder
ADD custom README
ADD choice to generate about page and documentation folder
2018-05-30 13:54:43 +02:00
Laurent Destailleur
c1f5c6becf Merge pull request #8877 from frederic34/longlines
soft limit length of lines to 500 chars
2018-05-30 11:19:29 +02:00
Laurent Destailleur
2ae9591d0d Fix english name 2018-05-29 11:10:21 +02:00
Frédéric FRANCE
e2a557aadd limit length of lines to 500 chars 2018-05-27 15:04:12 +02:00
Laurent Destailleur
fa252d5cbd Merge branch 'develop' into FIX_6.0_pdf_note_incoterm 2018-05-25 11:59:22 +02:00
Laurent Destailleur
9d407cdc03 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-05-25 11:27:04 +02:00
Laurent Destailleur
0e6aa3def3 Fix duplicate deprecated file 2018-05-25 11:26:50 +02:00
Laurent Destailleur
7f77f1bd5a Merge pull request #8825 from atm-florian/develop_advtrgtml
new : add adv targt emailing amdin with main feature level 1
2018-05-25 11:10:51 +02:00
Laurent Destailleur
b9fbf13eba Fix look and feel v8 2018-05-25 09:36:49 +02:00
Laurent Destailleur
9f2f8ca7e0 Fix scrutinizer 2018-05-25 09:31:16 +02:00
Laurent Destailleur
23e2bb20d9 Look and feel v8 2018-05-24 12:32:04 +02:00
Laurent Destailleur
e51aa68284 Fix link to warehouses for events 2018-05-24 12:16:04 +02:00
Laurent Destailleur
488c0c030e Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/modules/modProduct.class.php
2018-05-23 18:09:25 +02:00
Laurent Destailleur
3a06918b16 FIX Missing extrafields in export of stock or products 2018-05-23 18:00:27 +02:00
Laurent Destailleur
d1d8494666 FIX Missing extrafields in export 2018-05-23 17:48:18 +02:00
Marc de Lima Lucio
111f3a9649 FIX: pdf: overlap when linked elements and incoterms/public note displayed + port PR #8155 into supplier docs & contracts 2018-05-23 11:11:33 +02:00
Laurent Destailleur
a1c799507a Fix $contactobject not always defined 2018-05-23 08:16:24 +02:00
florian HENRY
22cdbffb0a new : add adv targt emailing amdin with main feature level 1 2018-05-21 10:58:16 +02:00
Alexandre SPANGARO
e2665bd30e NEW : Accountancy Add import on general ledger 2018-05-19 07:29:17 +02:00
Laurent Destailleur
e503aeb2e5 Merge pull request #8787 from aspangaro/8.0-a24
Update module assets
2018-05-18 09:05:46 +02:00
Laurent Destailleur
ef395fc36b Fix scrutinizer bugs 2018-05-16 15:23:52 +02:00
Alexandre SPANGARO
cb815e5e3b Update works 2018-05-13 07:50:24 +02:00
Laurent Destailleur
9315d9c423 NEW Introduce permission "approve" for "leave request" like for "expense
report"
2018-05-10 18:56:21 +02:00
Laurent Destailleur
a65170ba2d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-05-10 14:16:19 +02:00
Laurent Destailleur
0c35bc5284 Standardize code 2018-05-10 14:15:52 +02:00
Laurent Destailleur
3c6d1ccbac Merge branch 'develop' into develop 2018-05-10 13:13:53 +02:00
Laurent Destailleur
2fb5de6136 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-05-10 12:30:14 +02:00
Laurent Destailleur
c094a6c43e Reorder permissions 2018-05-10 12:29:58 +02:00
Laurent Destailleur
afa9db2a88 Merge pull request #8752 from delcroip/patch-14
FIX Add properly the project models
2018-05-10 11:54:00 +02:00
Laurent Destailleur
9e807c1c01 Merge pull request #8751 from wdammak/patch-7
Add models pdf to warehouse module
2018-05-10 11:41:03 +02:00
BENKE Charlene
79bb8ef6c7 Update modHoliday.class.php 2018-05-07 22:47:24 +02:00
BENKE Charlene
3d268933a4 Create mod_holiday_madonna.php 2018-05-07 22:35:19 +02:00
BENKE Charlene
a20632d31d Create mod_holiday_immaculate.php 2018-05-07 22:34:26 +02:00
BENKE Charlene
ffaff97af1 Create modules_holiday.php 2018-05-07 22:33:14 +02:00
BENKE Charlene
8546943898 Create index.html 2018-05-07 22:30:40 +02:00
atm-quentin
8cd6c72a2f NEW advanced rights 2018-05-07 10:04:43 +02:00
wdammak
d038bf3e4b Merge pull request #8 from Dolibarr/develop
Update rep
2018-05-06 17:01:44 +01:00
delcroix Patrick
a2c93e56ae fixAdd properly the project models
Previous code was adding only the Task model (project model where actually push during the installation) and only one of the two model available.
2018-05-06 13:36:37 +02:00
wdammak
fb81088a4b Add models warehouse and movement 2018-05-05 13:44:11 +01:00
Laurent Destailleur
546da0ceda Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/admin/account.php
	htdocs/core/modules/modStock.class.php
	htdocs/product/inventory/list.php
2018-05-05 14:40:39 +02:00
wdammak
c269699679 Add model_pdf to warehouse module 2018-05-05 13:33:34 +01:00
Laurent Destailleur
f6ca1eb624 Fix permission name 2018-05-05 13:24:46 +02:00
atm-quentin
ec5e84075e NEW Rights to ignore price min 2018-05-03 10:18:38 +02:00
wdammak
2cf1aa967c Add warehouse models pdf 2018-05-03 01:01:05 +01:00
Laurent Destailleur
cb76d2ce0f Better logging 2018-05-01 18:58:19 +02:00