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

60596 Commits

Author SHA1 Message Date
Laurent Destailleur
3c4956838e Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/actions_massactions.inc.php
	htdocs/core/tpl/massactions_pre.tpl.php
 2019-06-24 15:44:44 +02:00
Laurent Destailleur
04606ec6a3
Merge pull request #11384 from ATM-Consulting/7.0_fix_mass_send_mail 
FIX mass send mail
 2019-06-24 15:34:06 +02:00
Laurent Destailleur
b153019000 FIX security (a user can read leave or holiday of other without perm. 2019-06-23 18:08:24 +02:00
John Botella
ec7ebe9f39 redo backported fix and update adherent substitution methode 2019-06-21 15:32:38 +02:00
John Botella
200b66d11f Remove a backported fix because failling at init test 2019-06-21 14:52:12 +02:00
Laurent Destailleur
70c950bd7c Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/modules/modAdherent.class.php
 2019-06-21 11:26:25 +02:00
Laurent Destailleur
9093be2f0a FIX Add missing end date of subscription in export 2019-06-21 11:23:49 +02:00
John Botella
b21006614c Fix substitutions null 2019-06-20 12:00:44 +02:00
John Botella
6a68c8cd99 Fix display option email per participient 2019-06-20 11:09:37 +02:00
John Botella
9305403bea Fix duplicate pdf in mass sendmail 2019-06-20 10:32:32 +02:00
John Botella
252bd6d9ba FIX condition 2019-06-20 09:48:08 +02:00
John Botella
7c29fb614c Fix replacement and vars names 2019-06-20 09:21:35 +02:00
Laurent Destailleur
53688e2d0f
Merge pull request #11353 from fmarcet/8.0 
FIX: Wrong stock movement on supplier credit notes
 2019-06-20 03:11:28 +02:00
Laurent Destailleur
4c7a689fb5
Merge pull request #11373 from atm-john/8.0_fix_var_name 
FIX var name
 2019-06-20 02:57:39 +02:00
John Botella
31a53b72ae FIX var name 2019-06-19 16:55:45 +02:00
gauthier
3ad13adf31 FIX : better syntax 2019-06-19 10:43:42 +02:00
gauthier
7331e43db8 FIX : we need to fetch fourn invoice with ref in current entity 2019-06-19 10:19:33 +02:00
Laurent Destailleur
20e00ca290 FIX if last char of customercode is accent making the truncate of first 
chars wrong.
 2019-06-18 19:41:16 +02:00
Laurent Destailleur
81bca34a08 FIX A user may read holiday and expense report without permissions 2019-06-18 16:04:25 +02:00
Laurent Destailleur
6e9874b95a FIX A user may read holiday and expense report without permissions 2019-06-18 16:01:24 +02:00
Laurent Destailleur
6afda6a47a FIX invalid link on user.fk_user 2019-06-18 15:57:22 +02:00
Ferran Marcet
c62f370959 FIX: Wrong stock movement on supplier credit notes 2019-06-17 16:30:56 +02:00
Laurent Destailleur
e6b6246fea
Merge pull request #11334 from atm-florianm/8.0_FIX-print-dictionaries-escape 
FIX: in edit mode, dictionary inputs do not escape the string inside …
 2019-06-14 13:36:06 +02:00
atm-florian.m
787e1319b9 FIX: in edit mode, dictionary inputs do not escape the string inside the 'value' attribute, causing errors if there are any double quotes 2019-06-13 16:21:07 +02:00
Laurent Destailleur
3e6b7208cc Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-06-13 12:12:37 +02:00
Laurent Destailleur
319bc7ec8a Fix syntax error 2019-06-13 12:12:20 +02:00
Laurent Destailleur
b6f477fc83 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-06-13 12:07:24 +02:00
Laurent Destailleur
1318e26cda
Merge pull request #11298 from hregis/7.0_price 
FIX missing compatibility with multicompany transverse mode
 2019-06-13 10:01:05 +02:00
Laurent Destailleur
4cbfb67d63
Update html.formother.class.php 2019-06-13 09:59:10 +02:00
Laurent Destailleur
4f5f03b893
Merge pull request #11326 from atm-greg/FIX_massaction_presend 
Fix massaction presend
 2019-06-12 12:37:03 +02:00
Laurent Destailleur
0bf7512f28
Update actions_massactions.inc.php 2019-06-12 12:33:31 +02:00
atm-greg
47746fd17d fix template type 2019-06-12 12:30:49 +02:00
atm-greg
9ba102b6b9 bad object used 2019-06-12 12:08:16 +02:00
atm-greg
25031e534d fix massaction presend 2019-06-12 12:05:02 +02:00
Laurent Destailleur
1b6b471cb7 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-06-12 10:06:43 +02:00
Laurent Destailleur
8447259f25 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-06-12 10:06:34 +02:00
Laurent Destailleur
420f3bbdab FIX #11316 2019-06-12 10:05:53 +02:00
Maxime Kohlhaas
9c7c1ddceb Fix multicurrency setup page 2019-06-06 11:20:10 +02:00
Laurent Destailleur
36df2f1026 Fix css 2019-06-04 18:45:01 +02:00
Laurent Destailleur
7b3242693b FIX default value for duration of validity can be set from generic 
feature.
 2019-06-04 18:17:07 +02:00
Regis Houssin
5726b40a10 FIX try to use WHERE EXISTS instead DISTINCT 2019-06-03 17:26:03 +02:00
Regis Houssin
7fd1051efc FIX missing compatibility with multicompany transverse mode 
Conflicts:
	htdocs/core/class/html.formother.class.php
 2019-06-03 17:22:15 +02:00
Laurent Destailleur
094719e099 Fix prefix 2019-06-02 15:53:16 +02:00
Laurent Destailleur
a20d824b97 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-06-02 12:30:34 +02:00
Laurent Destailleur
300f46cb01 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-06-02 12:30:25 +02:00
Laurent Destailleur
a1a9313487
Merge pull request #11292 from atm-maxime/fix_invoice_from_contract2 
Fix : only invoice active lines of a contract
 2019-06-02 12:29:13 +02:00
Laurent Destailleur
4bbef9b478
Update card.php 2019-06-02 12:29:05 +02:00
Laurent Destailleur
7020e1ef29
Update card.php 2019-06-02 12:27:32 +02:00
Laurent Destailleur
2b3c5902e6
Merge pull request #11281 from atm-maxime/fix_warning_resource 
Fix : warnings in resource module
 2019-06-02 12:17:19 +02:00
Laurent Destailleur
cb927847ab
Update dolresource.class.php 2019-06-02 12:16:12 +02:00
Laurent Destailleur
40b212d5cc
Merge pull request #11280 from atm-maxime/fix_warning_page_var 
Fix : avoid warning and uniformize $page var use
 2019-06-02 12:14:47 +02:00
Laurent Destailleur
3e9fbf0148
Update index.php 2019-06-02 12:14:07 +02:00
Maxime Kohlhaas
916d3ce931 Fix : only invoice active lines of a contract 2019-06-02 11:00:58 +02:00
Maxime Kohlhaas
0372276a7b Fix : warnings in resource module 2019-05-31 16:04:12 +02:00
Maxime Kohlhaas
6dd01e86e9 Fix : avoid warning and uniformize var use 2019-05-31 15:53:23 +02:00
Maxime Kohlhaas
9ab2f44946 Fix : missing rights test to display tag create link 2019-05-31 15:14:56 +02:00
Maxime Kohlhaas
15fd24a511 Fix : remove hardcoded llx_ prefix 2019-05-31 12:14:51 +02:00
Laurent Destailleur
912e29a746 FIX #11244 2019-05-29 11:06:01 +02:00
Laurent Destailleur
3c05cfe690 Fix useless test 2019-05-29 10:50:33 +02:00
Laurent Destailleur
a491de01b3
Merge pull request #11244 from altatof/8.0 
FIX : do not include tpl from disabled modules
 2019-05-29 10:35:39 +02:00
Laurent Destailleur
2352463c21 Fix link to change validator is on validate status only 2019-05-28 13:23:12 +02:00
Laurent Destailleur
991e247e30 Fix edit of validator 2019-05-27 20:21:50 +02:00
Laurent Destailleur
02fc896612 FIX Even with permission, can't validate leave once validator defined. 2019-05-27 20:12:33 +02:00
Laurent Destailleur
7db643fff0 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-05-27 19:23:09 +02:00
Laurent Destailleur
93c395fe10 FIX confirmation of mass email sending + option MAILING_NO_USING_PHPMAIL 2019-05-27 19:22:51 +02:00
atm-ph
c79b9b9704 Fix create bills on mass action does not retrieve the original currency code 2019-05-27 11:18:29 +02:00
Christophe Battarel
83d883c36a finally eldy is always right 2019-05-24 15:14:34 +02:00
Christophe Battarel
4863ddcb00 Merge branch '8.0' of https://github.com/Dolibarr/dolibarr into 8.0 2019-05-24 15:13:23 +02:00
Laurent Destailleur
7a0c6859bd
Merge pull request #11240 from ATM-Marc/FIX_8.0_crabe_situation_vat 
FIX: crabe pdf: bad detailed VAT for situation invoices, in situations S2 and above
 2019-05-24 12:57:01 +02:00
Christophe Battarel
545cdd0762 test include return on FALSE 2019-05-24 12:54:24 +02:00
Christophe Battarel
abc7c2f0f8 test include return on TRUE 2019-05-24 12:33:40 +02:00
Christophe Battarel
aaaad71347 FIX : do not include disabled modules tpl 2019-05-24 12:10:58 +02:00
Marc de Lima Lucio
49385fcab3 FIX: situation invoices: bad detailed VAT in situations following the first one 2019-05-23 14:37:40 +02:00
Marc de Lima Lucio
54f8c98b27 FIX: remove isolated transaction commit 2019-05-22 11:12:02 +02:00
Marc de Lima Lucio
66dd7e30ae FIX: situation invoices: block progress percentage change for discount lines 2019-05-22 10:46:38 +02:00
Laurent Destailleur
f99f1d83c2
Merge pull request #11229 from frederic34/patch-7 
target _blank depend of mime
 2019-05-21 22:42:36 +02:00
Laurent Destailleur
16f7d96ed1
Merge pull request #11231 from ATM-Marc/FIX_8.0_extrafields_search 
FIX: extrafield list search: SQL error when field is multiselect
 2019-05-21 22:38:14 +02:00
Laurent Destailleur
dcf77520ea FIX Error management when MAILING_NO_USING_PHPMAIL is set 2019-05-21 21:16:06 +02:00
Marc de Lima Lucio
18a6ed17cf FIX: extrafield list search: SQL error when field is multiselect 2019-05-21 14:49:23 +02:00
Frédéric FRANCE
84781cabac
target _blank depend of mime 
target _blank is added in the previous line depending on mimtype
 2019-05-21 13:11:17 +02:00
Laurent Destailleur
ea5ffbb0bf
Merge pull request #11216 from atm-florian/8.0 
fix:  #11187
 2019-05-19 02:19:12 +02:00
florian HENRY
e4d87ab2e7 fix: #11189 2019-05-19 02:05:13 +02:00
Laurent Destailleur
7738787729 Merge branch '7.0' of https://github.com/dolibarr/dolibarr into 8.0 
Conflicts:
	htdocs/core/actions_sendmails.inc.php
 2019-05-19 02:03:16 +02:00
florian HENRY
6e7fe1a6c2 Merge branch '8.0' of https://github.com/Dolibarr/dolibarr into 8.0 2019-05-19 01:58:38 +02:00
florian HENRY
4311a1ece8 fix: #11187 2019-05-19 01:58:20 +02:00
Laurent Destailleur
0f3ae6dc39
Merge pull request #11215 from ATM-Marc/FIX_8.0_invoice_default_product_type 
FIX: invoice class: bad SQL request if product type not set
 2019-05-19 01:58:13 +02:00
Laurent Destailleur
2fd3eb8bdf
Update facture.class.php 2019-05-19 01:58:01 +02:00
Laurent Destailleur
684cbbdddb
Merge pull request #11212 from ATM-Marc/FIX_8.0_modulebuilder_foreignkey 
FIX: modulebuilder: hardcoded llx_
 2019-05-19 01:55:02 +02:00
ATM-Marc
83c38570e9 FIX: invoice class: bad SQL request if product type not set 2019-05-19 01:01:21 +02:00
Maxime Kohlhaas
1d980342ec Fix #8344 2019-05-19 00:05:23 +02:00
ATM-Marc
9b805f742b FIX: modulebuilder: hardcoded llx_ 2019-05-18 20:09:00 +02:00
Maxime Kohlhaas
095fd2769a Fix project beluga order status 2019-05-18 01:11:34 +02:00
ATM-Marc
b85ed3e0b7 FIX: mail presend: can overwrite a file previously uploaded 2019-05-18 00:11:15 +02:00
Maxime Kohlhaas
2a2f0557cf Fix : display hr tab on user if rights to read all 2019-05-17 17:07:38 +02:00
Laurent Destailleur
e2408fb54d
Merge pull request #11170 from atm-greg/Fix_margin_calculation_on_display 
fix useless calculation
 2019-05-13 20:20:01 +02:00
atm-greg
644f247910 fix useless calculation 2019-05-13 12:02:46 +02:00
Laurent Destailleur
1626c9fb6e
Merge pull request #11145 from atm-gauthier/8.0_fix_filename_with_two_spaces 
FIX : use dol_sanitizeFileName() function to remove double spaces in …
 2019-05-13 12:01:05 +02:00
Laurent Destailleur
c67d79a4e2
Update files.lib.php 2019-05-13 12:00:13 +02:00
Juanjo Menent
072a455ca4 Prepare 8.0.6 2019-05-11 22:55:42 +02:00
Juanjo Menent
f4ca6916cd Merge remote-tracking branch 'upstream/7.0' into 8.0 
# Conflicts:
#	htdocs/contrat/services_list.php
#	htdocs/expensereport/list.php
#	htdocs/projet/list.php
 2019-05-11 17:31:23 +02:00
Juanjo Menent
3a99ef7319 Fix: missing GETPOST params 2019-05-11 17:04:05 +02:00
Juanjo Menent
3ae2d71ea6 Fix: missing GETPOST params 2019-05-11 17:00:55 +02:00
Juanjo Menent
91ae365588 Fix: missing GETPOST params 2019-05-11 16:58:00 +02:00
Juanjo Menent
6206519456 Fix: missing GETPOST params 2019-05-11 16:54:56 +02:00
Juanjo Menent
2e6cb2afaa Fix: missing GETPOST params 2019-05-11 16:53:16 +02:00
Juanjo Menent
dc9f8a349f Fix: missing GETPOST params 2019-05-11 16:50:31 +02:00
Juanjo Menent
80ef97e215 FIX: #11025 2019-05-11 16:41:01 +02:00
Juanjo Menent
759427f6ac FIX: #11025 2019-05-11 16:36:35 +02:00
Juanjo Menent
81bf7d07e3 Merge remote-tracking branch 'upstream/7.0' into 7.0 2019-05-11 16:32:02 +02:00
Juanjo Menent
72dd3705ed Merge remote-tracking branch 'upstream/7.0' into 7.0 2019-05-10 09:13:33 +02:00
gauthier
f661b926fa FIX : use dol_sanitizeFileName() function to remove double spaces in filenames, as well as done on document.php when we want to download pdf 
Example : if you upload a file like "my  file.pdf" (with 2 spaces), it's impossible to download it after. then we have to remove at least 1 space
 2019-05-07 14:33:17 +02:00
atm-greg
e0c3cf8360 fix project link for stock correction 2019-05-03 10:24:49 +02:00
Laurent Destailleur
45d618cd7a Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-05-02 14:37:54 +02:00
Laurent Destailleur
ae7ba162f2 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-05-02 14:37:46 +02:00
Laurent Destailleur
50b1a54dca FIX Update/delete currency on same languages 2019-05-01 14:06:30 +02:00
Frédéric FRANCE
d9a1c2b235
Fix do not delete all discount when splitting 2019-04-30 13:54:50 +02:00
Laurent Destailleur
0532598ecf Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2019-04-27 13:28:05 +02:00
Laurent Destailleur
410a3801da Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2019-04-27 13:27:52 +02:00
gauthier
31897f54ac Fix prev situation invoice selection (backport fix 8.0) 2019-04-25 12:37:05 +02:00
Laurent Destailleur
50a4d54d8a Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-04-25 01:37:32 +02:00
Laurent Destailleur
07caf22647 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-04-25 01:37:25 +02:00
atm-greg
70017da95a testing if customer invoice module is activated doesn't make sense on supplier commande card... 2019-04-24 14:59:54 +02:00
Laurent Destailleur
fb01f550f4
Merge pull request #11016 from ATM-Nicolas/fix_activity_perweek 
FIX : Total per day in timespent per week
 2019-04-24 10:21:08 +02:00
atm-greg
6e425d1895 add origin of line in fourn orderstoinvoice.php 2019-04-24 08:56:06 +02:00
atm-greg
3231e54abd fix actioncomm module for long trigger names 2019-04-23 16:19:58 +02:00
Laurent Destailleur
bf7fcce1b2 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-04-23 12:24:25 +02:00
Laurent Destailleur
11d737f23a
Merge pull request #11029 from ATM-Marc/FIX_7.0_sort_events 
FIX: actioncomm: sort events by date after external calendars and hook (into 7.0)
 2019-04-19 13:06:09 +02:00
John BOTELLA
0855d84ccf FIX error messages not displayed 2019-04-18 10:40:34 +02:00
Laurent Destailleur
c0defe3965
Update index.php 2019-04-16 23:27:45 +02:00
Marc de Lima Lucio
1669d497b4 FIX: actioncomm: sort events by date after external calendars and hook 2019-04-16 17:36:27 +02:00
ATM-Nicolas
93365addd1 FIX : Total per day shows 00:00 if the total time spent is equal to 12:00 2019-04-15 11:40:58 +02:00
ATM-Nicolas
d4a7c0abc6 FIX : Wrong variable name 2019-04-15 10:05:46 +02:00
Juanjo Menent
1b5cabad71 Fix: #10956 2019-04-12 18:50:48 +02:00
atm-quentin
6deba39c6a FIX credit note can be split 2019-04-12 10:16:13 +02:00
atm-quentin
7ae6472e36 Merge branch '8.0' of github.com:Dolibarr/dolibarr into FIX_credit_note_used_on_list 2019-04-12 09:20:16 +02:00
gauthier
9a24007c0a FIX : better test 2019-04-11 15:32:50 +02:00
gauthier
524b186959 FIX : Product accountancey sell intra code must be visible if main feature level 1 2019-04-11 15:19:40 +02:00
Laurent Destailleur
ffca289bff Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-04-08 14:04:42 +02:00
Laurent Destailleur
125796b0f5
Merge pull request #10967 from atm-ph/fix_7.0_timesheet_init_hook 
Fix no init hook on timesheet
 2019-04-08 13:49:21 +02:00
Laurent Destailleur
c1f0826005
Update perweek.php 2019-04-08 13:49:16 +02:00
Laurent Destailleur
153e563c9f
Update perday.php 2019-04-08 13:49:05 +02:00
Laurent Destailleur
cd1322de79
Merge pull request #10959 from atm-arnaud/8.0_fix_shipping_default_warehouse_if_one 
FIX shipping default warehouse if only one warehouse
 2019-04-08 13:32:34 +02:00
atm-ph
ea87b2ddb6 Fix no init hook on timesheet 2019-04-05 11:26:11 +02:00
Laurent Destailleur
eaf9a2402a Fix length of label 2019-04-04 17:39:51 +02:00
Laurent Destailleur
4489db2a70 Fix field surface/weight not loaded 2019-04-04 17:06:26 +02:00
atm-arnaud
0b6c7d2d63 FIX shipping default warehouse if only one warehouse 2019-04-04 11:17:44 +02:00
Laurent Destailleur
17a61b3232 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-04-02 19:34:49 +02:00
Laurent Destailleur
26fbd6e2ec Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2019-04-02 19:34:16 +02:00
Laurent Destailleur
cb1489e2fa Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2019-04-02 19:34:10 +02:00
Laurent Destailleur
2f51221660
Merge pull request #10933 from atm-greg/Add_final_hooks_on_replenish 
Add all missing hooks on replenish
 2019-03-31 18:50:34 +02:00
Laurent Destailleur
143cbba09b
Update card.php 2019-03-31 18:49:38 +02:00
Alexandre SPANGARO
5588fe5b81 FIX: Don't show journal:getNomUrl without data 
ErrorBadValueForParamNotAString
 2019-03-30 09:42:13 +01:00
atm-greg
957fae1081 missing params 2019-03-28 11:07:27 +01:00
atm-greg
11343e986c add all missing hooks on replenish 2019-03-28 10:47:32 +01:00
atm-greg
83d7750274 FIX missing hook completeTabsHead in margins module 2019-03-27 09:33:51 +01:00
Laurent Destailleur
e5f54bd14c FIX Remane of project 2019-03-26 12:35:44 +01:00
Laurent Destailleur
3ede626932 FIX If we build one invoice for several orders, we must put the ref of 
order on the line to not lose information.

Conflicts:
	htdocs/commande/list.php
	htdocs/core/actions_massactions.inc.php
 2019-03-23 22:34:10 +01:00
Laurent Destailleur
37cc5b7d35
Merge pull request #10901 from fmarcet/8.0 
FIX: The minimum amount filter does not work in VAT report by customer
 2019-03-22 12:27:30 +01:00
Ferran Marcet
f37c1b9287 FIX: The minimum amount filter does not work in the VAT report per customer 2019-03-22 09:28:50 +01:00
Laurent Destailleur
75b94d373f
Merge pull request #10897 from frederic34/patch-4 
Update extrafields.class.php
 2019-03-21 18:27:04 +01:00
Laurent Destailleur
1075ef8cf2 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-03-21 18:25:43 +01:00
Laurent Destailleur
f7f20df323
Merge pull request #10891 from atm-greg/Add_hook_on_replenish 
Add hook on replenish
 2019-03-21 18:23:06 +01:00
Frédéric FRANCE
d10b94e72b
Update extrafields.class.php 2019-03-21 14:08:49 +01:00
Laurent Destailleur
a1fe1bb58c FIX when 2 extra fields are mandatory in 2 different entities 2019-03-21 12:33:39 +01:00
Laurent Destailleur
032aa869e4 FIX Can't insert if there is extrafields mandatory on another entity. 
FIX Can't set default value of extrafield of type varchar
 2019-03-21 12:14:15 +01:00
Laurent Destailleur
4c85068a85 FIX Can't insert if there is extrafields mandatory on another entity. 2019-03-21 11:53:04 +01:00
Laurent Destailleur
b11403103b Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-03-19 13:09:48 +01:00
Laurent Destailleur
8664594fc8 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-03-19 13:09:39 +01:00
Laurent Destailleur
89087c6847
Merge pull request #10800 from atm-quentin/FIX_wrong_vat_deposit_invoice 
Wrong vat if deposit from propal with multiple vat
 2019-03-18 11:14:11 +01:00
Regis Houssin
57091f08b0 FIX missing entity filter and wrong var name 2019-03-18 10:53:43 +01:00
Maxime Kohlhaas
46b39dd6a9 Fix #9961 : deal with supplier credit note refund like with customers 2019-03-16 18:13:43 +01:00
Laurent Destailleur
ae35c982af
Merge pull request #9652 from atm-gauthier/7.0_fix_round_debitcredit 
FIX : need to round with 2 decimals to avoid movements not correctly balanced
 2019-03-16 14:27:03 +01:00
Laurent Destailleur
55718cc7da
Merge pull request #10855 from atm-maxime/fix_missing_lang 
Fix #9311
 2019-03-16 13:43:35 +01:00
Maxime Kohlhaas
21e2d36421 Fix #9311 2019-03-16 09:28:47 +01:00
Maxime Kohlhaas
68945c7d51 Fix #10177 2019-03-16 09:11:43 +01:00
Laurent Destailleur
681d626284 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-03-15 19:17:31 +01:00
Laurent Destailleur
4bb45ad1c1
Merge pull request #10824 from atm-gauthier/7.0_fix_nocreateline_deposit_if_amount_zero 
FIX : when we create deposit with multi tva, we mustn't add line if a…
 2019-03-15 19:16:56 +01:00
Laurent Destailleur
b33c366b02
Update card.php 2019-03-15 19:16:49 +01:00
atm-ph
2da60fb885 Fix var name 2019-03-15 15:15:03 +01:00
Laurent Destailleur
84bff41543 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-03-15 11:00:24 +01:00
Laurent Destailleur
6c2cad3d48 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/core/lib/security.lib.php
 2019-03-15 11:00:00 +01:00
gauthier
8375b47e74 FIX : in fact expensereport must be in $check array 2019-03-15 10:21:50 +01:00
Laurent Destailleur
a8bd8a2101 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-03-14 18:49:24 +01:00
Laurent Destailleur
5ec8adb7f5 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2019-03-14 18:48:35 +01:00
Laurent Destailleur
4f84a1614c
Merge pull request #10808 from ATM-Marc/FIX_8.0_shipment_hooks 
FIX: several hooks in shipping/delivery cards
 2019-03-14 18:07:57 +01:00
gauthier
3fb6978bc8 FIX : no need to test anything to display documents tabs on expense report 2019-03-14 17:36:49 +01:00
gauthier
885797b748 FIX : useless join 2019-03-14 17:00:51 +01:00
Laurent Destailleur
feaca165ad
Merge pull request #10809 from joanlouis/fix-extrafields-calls-from-cards-8 
Fix extrafields calls from cards for Dolibarr 8 See #10803
 2019-03-14 14:22:31 +01:00
gauthier
a524bbc5c6 FIX : when we create deposit with multi tva, we mustn't add line if amount = 0 (example when we have a 100% reduc on one of origin invoice line) 2019-03-13 15:59:41 +01:00
Marc de Lima Lucio
36b44b1348 FIX: several hooks in shipping/delivery cards 2019-03-12 11:28:36 +01:00
Joan Louis
17647de4cc Fix extrafields calls from cards for Dolibarr 8 See #10803 2019-03-12 11:24:54 +01:00
atm-quentin
ab781c32c7 Wrong vat if deposit from propal with multiple vat 2019-03-11 11:28:25 +01:00
Alexandre SPANGARO
49f72b6a9a Merge remote-tracking branch 'upstream/8.0' into 8.0_EBP_export-TXT 2019-03-09 05:50:16 +01:00
Laurent Destailleur
4022d5f529 FIX Can not create contract with numbering module without autogen rule 2019-03-08 23:58:04 +01:00
Laurent Destailleur
233bd4374a Fix phpcs 2019-03-08 19:52:26 +01:00
Alexandre SPANGARO
d926657534 FIX: Accountancy - Format EBP import 
Add doc
 2019-03-08 10:57:14 +01:00
Laurent Destailleur
9a9fd15077 Fix doxygen 2019-03-07 14:10:33 +01:00
Laurent Destailleur
d2f1d0cc33 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/fourn/class/fournisseur.facture.class.php
 2019-03-07 14:06:11 +01:00
Laurent Destailleur
e96f84a3d6
Merge pull request #10765 from altatof/sd8 
FIX : supplier discount was not retrieved when choosing a product
 2019-03-07 13:26:44 +01:00
Laurent Destailleur
0349f9bfaa
Update objectline_create.tpl.php 2019-03-07 13:26:25 +01:00