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

1156 Commits

Author SHA1 Message Date
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
Laurent Destailleur
8cf2d4eb45 Fix filter on holiday statut 
Fix tr/td balance for extrafields on lines
 2018-03-20 10:10:21 +01:00
Laurent Destailleur
1837d6a5f3 Better look of lines 2018-03-19 12:30:48 +01:00
Laurent Destailleur
12068f9cf3
Merge branch 'develop' into 8.0-a7 2018-03-19 12:18:18 +01:00
Laurent Destailleur
c3cd2ff3db
Update objectline_view.tpl.php 2018-03-19 12:13:18 +01:00
Laurent Destailleur
6f7098d22e
Update objectline_view.tpl.php 2018-03-19 12:09:38 +01:00
Laurent Destailleur
ce3975377d Link to unlink is unlink and not remove 2018-03-19 12:02:49 +01:00
Laurent Destailleur
57e2240354 NEW Edit of extrafields position page on the edit form 2018-03-17 11:21:50 +01:00
Laurent Destailleur
ba47b6d051 NEW Add tab contact on supplier proposals 2018-03-16 10:21:53 +01:00
Laurent Destailleur
98b7d4c2e2 NEW Can set the start/end date of service line in invoice templates 2018-03-12 12:27:40 +01:00
Laurent Destailleur
cc7ac2a0da
Merge pull request #8313 from atm-florian/7.0_fix8241 
7.0 fix8241
 2018-03-09 22:47:43 +01:00
florian HENRY
42fed5981d bettre syntax 2018-03-09 19:16:06 +01:00
florian HENRY
02beed265e better space 2018-03-09 19:14:43 +01:00
florian HENRY
5a56e802d9 FIX #8232 2018-03-09 19:10:52 +01:00
Laurent Destailleur
1c9e7145e7
Merge pull request #8276 from ATM-Consulting/develop_atm 
NEW: supplier credit notes & discounts (absolute and relative)
 2018-03-08 20:06:37 +01:00
Alexandre SPANGARO
0182b724aa Merge remote-tracking branch 'uptream/develop' into 8.0-a7 2018-03-08 06:53:54 +01:00
Alexandre SPANGARO
3f2aa6a4fb New : On invoice card, show accounting account linked 2018-03-08 06:52:31 +01:00
Laurent Destailleur
7e6ba51780 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/projet/tasks/comment.php
 2018-03-07 13:06:29 +01:00
Laurent Destailleur
1ca5c7083a Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formother.class.php
	htdocs/theme/eldy/style.css.php
	htdocs/theme/md/style.css.php
 2018-03-07 11:54:48 +01:00
florian HENRY
6cb77577a6 can use image 2018-03-07 09:03:13 +01:00
Laurent Destailleur
1e6a55745c CSS 2018-03-06 11:54:05 +01:00
Marc de Lima Lucio
1765b09fda Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_atm 2018-03-05 11:05:38 +01:00
Laurent Destailleur
0a5edb871b
Merge pull request #8253 from ruistrecht-alt/Fix_supress_count_warning_in_extrafields_view_tpl 
FIX Suppress count warning in admin_extrafields_view.tpl
 2018-03-02 18:00:52 +01:00
Marc de Lima Lucio
451d943927 NEW: supplier credit notes: factorized discount block (+ correct translations for supplier discounts) 2018-03-02 16:48:25 +01:00
Laurent Destailleur
a3350d12d8 css 2018-03-01 23:51:06 +01:00
Marc de Lima Lucio
e07177fec2 FIX: supplier relativ discounts: pre-fill newlines with qty/discount 2018-03-01 12:31:33 +01:00
Laurent Destailleur
2368cb615f Look and feel v8 2018-03-01 11:51:25 +01:00
Marc de Lima Lucio
059801fe03 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_atm 2018-03-01 10:22:21 +01:00
Laurent Destailleur
6f29a574cf CSS 2018-03-01 02:37:18 +01:00
Laurent Destailleur
03858d73b1 NEW Add extrafield type "html" 2018-02-27 17:30:13 +01:00
Marc de Lima Lucio
7cd1b2caa9 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_atm 2018-02-27 16:45:01 +01:00
Marc de Lima Lucio
9cf45266f5 NEW: supplier relative discounts 2018-02-27 16:30:39 +01:00
Rui Strecht
24ae7b4780 Suppress count warning in admin_extrafields_view.tpl 2018-02-27 14:45:17 +00:00
Laurent Destailleur
2294a50c89 Fix tooltip 2018-02-27 13:05:59 +01:00
Laurent Destailleur
863cab362f NEW Cat set the encryption algorithm for extrafields of type password 2018-02-23 14:38:41 +01:00
Laurent Destailleur
8b479a05ad Can add property in password extrafield (prepare to choose encrypt algo) 2018-02-23 12:34:25 +01:00
John
768c09bc74 Fix import order 2018-02-23 09:23:50 +01:00
John
b88e7fdcf9 move button to dialog footer 2018-02-22 17:21:12 +01:00
John
c5b96e43c7 add new action to import order in invoice 2018-02-22 16:55:41 +01:00
John
a7a6630fad Add popin dialog 2018-02-22 15:19:20 +01:00
Laurent Destailleur
b87feab1e3 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/commonobject.class.php
 2018-02-22 12:19:20 +01:00
John
f313fb925b Add new checkbox for lines 2018-02-21 17:06:40 +01:00
John
bd0e8506f5 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into New_import_lines_from_linked_element 2018-02-21 11:53:16 +01:00
Laurent Destailleur
34135e0a13 Fix extrafield date or datetime with bad timezone 2018-02-20 19:20:47 +01:00
Laurent Destailleur
e465b0c40e Fix extrafield date or datetime with bad timezone 2018-02-20 19:19:27 +01:00
John
09c5dc506a Add html dom element and fix class 2018-02-20 17:46:32 +01:00
Laurent Destailleur
f207e91643 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/holiday/define_holiday.php
	htdocs/main.inc.php
	htdocs/societe/class/societe.class.php
 2018-02-20 15:06:41 +01:00
Marc de Lima Lucio
f5ad93b272 NEW: supplier credit notes: handle Excess Paid + translation 2018-02-19 15:52:07 +01:00
Maxime Kohlhaas
bfd46f62ea Fix : contact and user getnomurl needs all info to display tooltip correctly 2018-02-15 15:18:25 +01:00
Marc de Lima Lucio
4f9bb33600 NEW: supplier credit notes: convert to usable absolute discount + link/unlink to supplier invoice + create supplier credit note from excess paid 2018-02-14 10:47:10 +01:00
Laurent Destailleur
7ed128ff2b Fix bad escaping 2018-02-13 14:30:14 +01:00
Laurent Destailleur
7743f88e98 Fix bad escaping 2018-02-13 14:03:11 +01:00
Laurent Destailleur
eccdc9a075 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
	htdocs/langs/pt_PT/companies.lang
 2018-02-08 15:20:24 +01:00
Laurent Destailleur
ab21769aa2 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/compta/facture/card.php
 2018-02-08 12:58:47 +01:00
Laurent Destailleur
879308e0ef Fix responsive 2018-02-08 10:15:53 +01:00
jh z
131eed97a1 New: Add a tab of Docments to expedition module 2018-02-07 22:56:14 +08:00
Laurent Destailleur
565372eaab Fix param showsize. Fix extrafields field too long 2018-02-06 10:34:29 +01:00
Laurent Destailleur
1a1e6adcb9 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-02-04 13:57:07 +01:00
Laurent Destailleur
7ed66457b4 Fix ref already output 2018-02-04 13:55:18 +01:00
Laurent Destailleur
e982e1d28c
Merge pull request #8062 from atm-maxime/new_disable_freelines 
NEW hidden option MAIN_DISABLE_FREE_LINES
 2018-02-03 17:02:05 +01:00
Laurent Destailleur
a308e45c6b
Update objectline_create.tpl.php 2018-02-03 17:00:47 +01:00
Laurent Destailleur
0412d3d11d Fix extrafield mandatory check.Fix empty extrafields with type link. 2018-02-01 19:05:24 +01:00
Laurent Destailleur
0385dfe859 Fix td balance 2018-02-01 00:49:12 +01:00
Laurent Destailleur
de0a8ba71f Fix extrafields 2018-01-31 14:01:58 +01:00
Laurent Destailleur
64f6e9e5c0 CSS 2018-01-24 12:23:52 +01:00
Laurent Destailleur
561f273900 Minor fix for smartphone 2018-01-24 11:43:34 +01:00
Laurent Destailleur
f1b63d7cbf Fix css 2018-01-23 09:00:03 +01:00
Laurent Destailleur
2ed34d813d Css 2018-01-22 16:04:58 +01:00
Laurent Destailleur
25d59cf107 Fix sort on common fields 2018-01-15 18:05:15 +01:00
Laurent Destailleur
90fc086814 Fix minor 2018-01-14 20:11:38 +01:00
Maxime Kohlhaas
c45e5c91b1 New hidden option MAIN_DISABLE_FREE_LINES 2018-01-14 17:13:42 +01:00
Laurent Destailleur
7c480f76e3 Fix thumbs of pdf at wrong place 
Fix param not provided
Fix css
 2018-01-13 16:09:05 +01:00
Laurent Destailleur
d0680b429f Fix name of file saved from tax document tab 2018-01-12 17:39:20 +01:00
Laurent Destailleur
4f8a447d30 Fix alignement 2018-01-12 14:09:51 +01:00
Laurent Destailleur
6c9d5984a2 Fix trans key 2018-01-12 14:03:03 +01:00