Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
79,034 Commits 36 Branches 189 Tags
fec67aade476d54d96db49b200bf53e0927e5eb0
Commit Graph

1430 Commits

Author SHA1 Message Date
atm-quentin
d53aa71673 NEW advance target filtering can be used everywhere with tpl and fk_element 2018-06-22 10:54:00 +02:00
Philippe GRAND
62586c7c5d clean and upsdate code 2018-06-18 12:47:17 +02:00
Laurent Destailleur
50aa674ebc Fix support of 'help' field property. Fix bad td closing. 2018-06-13 13:36:40 +02:00
Laurent Destailleur
f4bef82bfa Fix td not closed and js code duplicated (at wrong place) 2018-06-13 13:00:08 +02:00
Laurent Destailleur
5ea1890f0c Fix payments on contract line 2018-06-06 10:28:53 +02:00
Laurent Destailleur
87d073b5cd Fix conflict with external ticketsup module 2018-06-04 21:49:29 +02:00
bgenere
89d9fe3919 FIX Issue for extra fields date display in template. 
Template is now consistent with the extrafiels_view template
 2018-05-30 17:08:01 +02:00
Laurent Destailleur
a2d485c14f Fix management of enabled property extrafields 2018-05-13 14:27:40 +02:00
Laurent Destailleur
c76e866f41 CSS 2018-05-13 14:06:57 +02:00
ATM-Nicolas
5bc9799bf1 FIX : Drag and drop lines with extrafields 2018-05-07 16:30:22 +02:00
Abbes Bahfir
17b8de2cdd New : Option INVOICE_CAN_REMOVE_DRAFT_ONLY to delete draft invoices with precedence over INVOICE_CAN_ALWAYS_BE_REMOVED 2018-05-05 12:57:29 +01:00
TuxGasy
12440e6a7e Do not display multicurrency cols if currency of object is same as main currency 2018-05-02 11:30:35 +02:00
Laurent Destailleur
5eb7c7ffff FIX Edit of ref_supplier in supplier invoice 2018-04-24 13:22:34 +02:00
Laurent Destailleur
c5e0838946 Set position by default to 100 2018-04-20 01:56:35 +02:00
Laurent Destailleur
99feaf5275 Fix reposition class 2018-04-19 21:33:26 +02:00
Laurent Destailleur
4dadfac74b Debug usage of the new extrafield architecture 2018-04-17 14:34:17 +02:00
Laurent Destailleur
c3970f1a52 Code comment 2018-04-17 09:44:57 +02:00
Laurent Destailleur
106fb87d0a NEW Can sort order of files in attach tab for leave and expensereport 2018-04-16 19:25:27 +02:00
Laurent Destailleur
c702c88fde CSS 2018-04-16 13:11:48 +02:00
Laurent Destailleur
db385d64b6 Fix br 2018-04-14 23:24:01 +02:00
Laurent Destailleur
be965bdbab Clean code 2018-04-13 13:28:48 +02:00
Laurent Destailleur
fbae4429b7 Clean code for better extrafields management 2018-04-13 12:52:23 +02:00
Laurent Destailleur
78fcbe9633 FIX the extrafields separator was not translated 2018-04-13 10:48:29 +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
Laurent Destailleur
3cecfd02c7 NEW Mutualize code for action="update_extras" 
NEW Can use setValueFrom without user modification field
FIX Exclude separators from mandatory extrafields test
More code to use the new framework array for extrafields
Can use text condition in extrafield visibility
 2018-04-12 23:16:23 +02:00
All-3kcis
21df700325 Add option to save file with product batch ref 
+ use batch number like ref instead of id
+ debug access to shared link
 2018-04-12 15:55:08 +02:00
All-3kcis
a8fbf4a370 Add option to save file with product ref 2018-04-12 15:40:09 +02:00
Laurent Destailleur
698f5c165a Merge pull request #8430 from atm-florian/dev_mailtouser 
NEW : Can select from the user list into send form email (For field to and CC)
 2018-04-11 17:55:40 +02:00
Laurent Destailleur
e543a6bf85 Merge pull request #8549 from atm-greg/fix_multiselect_filter 
FIX #8480
 2018-04-11 17:38:30 +02:00
Laurent Destailleur
590bc2948a Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/compta/bank/card.php
	htdocs/core/tpl/admin_extrafields_view.tpl.php
 2018-04-11 17:20:49 +02:00
Laurent Destailleur
0518218aed Fix regression 2018-04-11 17:17:03 +02:00
Laurent Destailleur
75bc3d17e6 Update admin_extrafields_view.tpl.php 2018-04-11 14:55:29 +02:00
atm-greg
8a0baaad17 fix #8480 2018-04-10 16:25:06 +02:00
Laurent Destailleur
0bf4381226 NEW The field "visible" on extrafield can accept expression as condition 2018-04-10 15:39:11 +02:00
gauthier
5621d1f8ea FIX #8478 !empty instead of count to avoid warning 2018-04-10 15:03:15 +02:00
Laurent Destailleur
0abcf5694c Fix message of discount 2018-04-06 20:18:36 +02:00
Laurent Destailleur
85d4f7115b Better position of the substitution tooltip for emails 2018-04-06 16:16:08 +02:00
florian HENRY
cc0fb830b8 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_mailtouser 2018-04-05 10:53:17 +02:00
John
d689e88b92 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into New_import_lines_from_linked_element 2018-04-03 11:38:12 +02:00
Laurent Destailleur
927d86f27f Revert "NEW: formconfirm in javascript" 
This reverts commit 50790d5527.
 2018-03-31 23:10:12 +02:00
Laurent Destailleur
43f8834b28 Uniformize code with the new module builder framework 2018-03-31 18:48:27 +02:00
Laurent Destailleur
7c394733e4 Merge pull request #8445 from ATM-Consulting/develop_atm 
NEW: bank reconcile: checkbox to select all bank operations
 2018-03-29 14:49:41 +02:00
Laurent Destailleur
6f6395e309 Code comment 2018-03-27 23:01:54 +02:00
florian HENRY
ffbeb17ec2 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_mailtouser 2018-03-25 17:19:27 +02:00
Laurent Destailleur
53dde8dc0c Fix confirmation email for membership payment 2018-03-25 15:00:43 +02:00
Laurent Destailleur
53edb86ffb Make sending of email for member module ok with new email template archi 2018-03-23 19:35:25 +01:00
Marc de Lima Lucio
50790d5527 NEW: formconfirm in javascript 2018-03-23 16:54:33 +01:00
Laurent Destailleur
700c69e127 NEW Can set position of images in module tickets 
Mutualize code of method show_photo
 2018-03-22 11:46:35 +01:00
florian HENRY
dc6f4c1f4d NEW : option to send email to salaries 2018-03-21 11:48:30 +01:00
Laurent Destailleur
d7ad899839 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/contrat/card.php
	htdocs/core/class/conf.class.php
	htdocs/core/tpl/objectline_view.tpl.php
	htdocs/holiday/list.php
 2018-03-20 14:52:27 +01:00