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

3167 Commits

Author SHA1 Message Date
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
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
Laurent Destailleur
8be8249f85 Clean code, fix warnings 2018-05-01 12:40:42 +02:00
Laurent Destailleur
f50a6149d5 Look and feel v8 (menu statistics at end) 2018-05-01 11:09:03 +02:00
Laurent Destailleur
55f982e504 Removed deprecated FPDI option and reorganise PDF setup page 2018-04-30 09:28:24 +02:00
Laurent Destailleur
82a8513aed Standardize code 2018-04-29 19:52:14 +02:00
Laurent Destailleur
e168240ab0 Debug module DAV 2018-04-29 18:32:15 +02:00
Regis Houssin
2906358383 Fix: use "socpeople" instead "societe" 2018-04-27 10:42:10 +02:00
Laurent Destailleur
ae412f228d NEW Experimental DAV module provides a public and private directory 2018-04-25 12:22:02 +02:00
Laurent Destailleur
32511422ab Fix PSR2 2018-04-22 20:08:29 +02:00
Laurent Destailleur
69adf73f4f Clean code from $var = True 2018-04-22 19:27:37 +02:00
Laurent Destailleur
fec9303d18 Remove useless $var 2018-04-22 18:51:03 +02:00
Laurent Destailleur
46e448a086 Fix default agenda view 2018-04-22 17:57:20 +02:00
Laurent Destailleur
f83369d268 Remove travis warnings 2018-04-22 11:27:26 +02:00
Laurent Destailleur
9eeaf5c3eb dol_syslog now strftime instead of dol_print_date 2018-04-21 12:22:21 +02:00
Laurent Destailleur
f6743484dd Better support of option COMPANY_AQUARIUM_CLEAN_REGEX 2018-04-21 00:58:42 +02:00
Laurent Destailleur
38d200d8a6 Fix left menu 2018-04-20 13:23:34 +02:00
Laurent Destailleur
7baf0eddbc NEW Add hidden option COMPANY_AQUARIUM_CLEAN_REGEX to clean generated 
accounting account.
 2018-04-20 01:10:57 +02:00
Laurent Destailleur
7256edc831 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-04-18 03:28:50 +02:00
Laurent Destailleur
013f95f54b Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-04-18 00:02:51 +02:00
Laurent Destailleur
5713a048fe
Merge pull request #8632 from aspangaro/8.0-a21 
Fix Accountancy
 2018-04-17 21:30:16 +02:00
Alexandre SPANGARO
e0c0f7fd9b Fix Accountancy 2018-04-17 20:04:55 +02:00
Laurent Destailleur
fee4966219
Merge pull request #8601 from frederic34/esign 
NEW add optional esign field in pdf propal
 2018-04-17 16:12:53 +02:00
atm-greg
90f1ab8af4 add hooks on supplier documents 2018-04-16 06:46:22 +02:00
Laurent Destailleur
e2838aa074 NEW Show also size in bytes in tooltip if visible unit is not bytes 2018-04-15 17:58:13 +02:00
Frédéric FRANCE
46cfe1e2e7
Merge remote-tracking branch 'upstream/develop' into esign 2018-04-15 14:33:03 +02:00
Frédéric FRANCE
d4c03230a0
add optional esign field in pdf propal 2018-04-15 11:34:21 +02:00
Regis Houssin
d97c052d08 Fix: broken $pdf object ! 2018-04-14 10:41:38 +02:00
Laurent Destailleur
6e288fca75
Merge pull request #8575 from all3kcis/develop-patch-16 
NEW Add files management on products lot
 2018-04-13 00:57:13 +02:00
All-3kcis
f7e58f3c73 Add files management on products lot 2018-04-12 15:10:37 +02:00
Laurent Destailleur
ea2fd67e0d Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/bank/card.php
	htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
	htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
	htdocs/core/tpl/admin_extrafields_view.tpl.php
	htdocs/langs/de_DE/admin.lang
 2018-04-12 13:31:14 +02:00
Laurent Destailleur
e437989853 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-04-12 13:25:27 +02:00
atm-greg
ae34fa6fbd add supplier contact name on supplier documents 2018-04-11 17:42:26 +02:00
Laurent Destailleur
419b225120 Clean code 2018-04-07 21:11:58 +02:00
Laurent Destailleur
d7d9c8c338 Fix module descriptor of dav module 2018-04-07 21:04:08 +02:00
Laurent Destailleur
98b9f6bb47 DAV module 2018-04-07 19:12:41 +02:00
Laurent Destailleur
049b9b2a5f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-04-06 14:19:25 +02:00
Laurent Destailleur
8e778df0ff Debug stripe module 2018-04-06 14:05:07 +02:00
Alexandre SPANGARO
06dc70df09 Merge remote-tracking branch 'uptream/develop' into 8.0-a13 2018-04-05 20:42:28 +02:00
Laurent Destailleur
48ff89c63b Fix regression 2018-04-05 19:52:54 +02:00
Laurent Destailleur
0223d54107 FIX Support or multicompany for sheduled jobs 
FIX Use priority to define order of sheduled jobs

Conflicts:
	htdocs/cron/list.php
 2018-04-05 12:38:42 +02:00
Laurent Destailleur
0de65b7822 FIX Support or multicompany for sheduled jobs 
FIX Use priority to define order of sheduled jobs
 2018-04-05 12:36:14 +02:00
Alexandre SPANGARO
a5428cc8c7 NEW Module Assets 2018-04-01 21:26:52 +02:00
Philippe GRAND
5b1efc2227 New [*use loadLangs for translation files*] and update code 2018-03-27 19:30:31 +02:00
Laurent Destailleur
6eca679f68
Merge pull request #8453 from OPEN-DSI/fix-import-insert-foreign-key 
FIX #7581 Import INSERT foreign key
 2018-03-27 17:47:45 +02:00
Laurent Destailleur
d41908e52a
Update import_xlsx.modules.php 2018-03-27 17:46:50 +02:00
Laurent Destailleur
86c4bb23ad
Update import_csv.modules.php 2018-03-27 17:46:28 +02:00
Laurent Destailleur
3eee68c404 NEW Prototype of a module DAV 2018-03-27 16:18:12 +02:00
François J
e892089afd Fix Import INSERT foreign key 
Check the row referencing this foreign key exists first
instead of always trying to perform an UPDATE.
 2018-03-26 17:52:43 +02:00
Laurent Destailleur
9f11cf77df Merge ticket css in main css 2018-03-26 15:45:56 +02:00
Laurent Destailleur
852191010a Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2018-03-25 15:29:11 +02:00
Laurent Destailleur
934d2d8881 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/filefunc.inc.php
 2018-03-25 15:27:31 +02:00
Laurent Destailleur
7363ae17ee Move setup of email for module module into email templates 2018-03-23 16:09:46 +01:00
florian HENRY
1feb22ea9c fix user right on modRessource 2018-03-21 22:24:11 +01:00
Laurent Destailleur
423bd56646
Merge pull request #8423 from grandoc/new_branch_20_03_2018 
New [*use loadLangs for translation files*]
 2018-03-21 20:39:40 +01:00
Laurent Destailleur
517301f014 Work on subscription reminder 2018-03-21 16:40:09 +01:00
Laurent Destailleur
200fd88132 Fix output message in log rotation job 2018-03-21 13:56:24 +01:00
Philippe GRAND
0d7ffefc8f New [*use loadLangs for translation files*] 2018-03-20 19:47:25 +01:00
Laurent Destailleur
09beb9186e
Merge pull request #8403 from atm-maxime/develop 
New filter on product supplier price import update
 2018-03-18 14:18:20 +01:00
Philippe GRAND
68b1e5f8fd New [*use loadLangs for translation files*] 2018-03-16 17:40:19 +01:00
Maxime Kohlhaas
3ccdb4d829 New filter on product supplier price import update 2018-03-16 14:22:46 +01:00
Laurent Destailleur
5a397fff72 Fix scrutinizer bugs 2018-03-16 00:16:32 +01:00
Laurent Destailleur
7f8f0c5dc1 Fix parameter silent was inverted 2018-03-15 21:48:51 +01:00
Philippe GRAND
e8df916770 New [*use loadLangs for translation files*] 2018-03-15 17:14:11 +01:00
Laurent Destailleur
ea3fbf63cd
Merge pull request #8390 from grandoc/new_branch_14_03_2018 
New [*use loadLangs for translation files*]
 2018-03-15 15:07:55 +01:00
Laurent Destailleur
9256faf6fb
Update pdf_merou.modules.php 2018-03-15 15:07:08 +01:00
Philippe Grand
c8e672d01a
use $outputlangs instead of $langs 2018-03-15 09:18:40 +01:00
Philippe Grand
3f0764f282
use $outputlangs instead of $langs 2018-03-15 09:17:53 +01:00
Philippe Grand
e6d2effba1
use $outputlangs instead of $langs 2018-03-15 09:15:22 +01:00
Philippe Grand
09d0dc7ba7
use $outputlangs instead of $langs 2018-03-15 09:14:09 +01:00
Philippe Grand
f6fd03a4f3
Change $langs by $outputlangs 2018-03-15 09:06:01 +01:00
Alexandre SPANGARO
9ce6ab915c Merge remote-tracking branch 'uptream/develop' into 8.0-a9 2018-03-15 06:24:51 +01:00
Alexandre SPANGARO
5eccc6bcbc NEW Add stats in salaries module 2018-03-15 06:23:20 +01:00
Philippe GRAND
743a61159d use loadLangs for translation files 2018-03-14 19:34:33 +01:00
Philippe GRAND
13ce041313 use loadLangs for translation files 2018-03-14 19:26:46 +01:00
Philippe GRAND
a5dc583906 use loadLangs for translation files 2018-03-14 19:10:22 +01:00
Laurent Destailleur
4bd05f854c
Merge pull request #8371 from frederic34/pdfaddress 
add object in pdf_build_address source
 2018-03-13 14:04:49 +01:00
Laurent Destailleur
9f07ff0f9b Fix travis 2018-03-13 14:00:35 +01:00
Laurent Destailleur
e6dd312bd5 Debug ticket module 2018-03-13 13:56:45 +01:00
Frédéric FRANCE
c76dce64d3
add object in pdf_build_address source 2018-03-13 12:15:03 +01:00
Laurent Destailleur
8048259733 Work on ticket module integration 2018-03-13 12:13:47 +01:00
Laurent Destailleur
cd71e49762 Picto ticket module 2018-03-13 10:42:58 +01:00
Laurent Destailleur
78b0585798 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/taxes.php
 2018-03-12 19:09:57 +01:00
Laurent Destailleur
55d3e72463 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/contact/class/contact.class.php
	htdocs/societe/card.php
 2018-03-12 19:02:30 +01:00
Laurent Destailleur
ae82d045f8 Dolibarrize module ticket 2018-03-11 23:56:17 +01:00
Laurent Destailleur
70490e2b4b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/ticketsup/class/actions_ticketsup.class.php
 2018-03-11 18:29:19 +01:00
Laurent Destailleur
8b6dea218b Dolibarrize module 2018-03-11 18:28:27 +01:00
Laurent Destailleur
d9b55f2275
Merge branch 'develop' into dev_ticketsup 2018-03-11 18:12:47 +01:00
Laurent Destailleur
40cf236f92
Merge branch 'develop' into ticketsup_core 2018-03-11 18:10:11 +01:00
Laurent Destailleur
d6eee30ee9
Merge pull request #8336 from defrance/patch-106 
add sql log on install debug
 2018-03-11 18:06:18 +01:00
Laurent Destailleur
dea80eba4e
Use a constant name starting with MAIN 2018-03-11 18:06:08 +01:00
jfefe
c3fab4c54c Fix Phpunit issue 2018-03-11 16:48:26 +01:00
florian HENRY
cfdaa7c88d ticket sup make it work 2018-03-11 16:07:13 +01:00
Laurent Destailleur
e14d2f08b8 Dolibarize 2018-03-11 11:12:38 +01:00
BENKE Charlene
bfaffe6692
Changes Done 2018-03-11 10:51:05 +01:00