Ferran Marcet
|
b462e7b217
|
FIX When delete a product, llx_product_association rows are not deleted
|
2018-10-17 10:01:02 +02:00 |
|
Laurent Destailleur
|
7cd8b36cea
|
Merge pull request #9755 from atm-greg/fix_massaction_delete_tasks
FIX modify parenting before task deletion
|
2018-10-16 19:45:43 +02:00 |
|
atm-greg
|
06477b40a0
|
modify parenting before task deletion
|
2018-10-15 12:34:14 +02:00 |
|
Frédéric FRANCE
|
4d6d3afbea
|
code comment
|
2018-10-15 08:39:46 +02:00 |
|
Laurent Destailleur
|
fabc11191d
|
Merge pull request #9739 from frederic34/patch-11
fix size of $head when replacing by hook
|
2018-10-14 16:27:14 +02:00 |
|
Laurent Destailleur
|
f9a66a34d0
|
Merge pull request #9738 from frederic34/patch-9
fix doc in import.lib.php
|
2018-10-14 16:24:47 +02:00 |
|
Frédéric FRANCE
|
70a98743e8
|
Update functions.lib.php
|
2018-10-14 10:48:06 +02:00 |
|
Frédéric FRANCE
|
1f1a614b47
|
Update import.lib.php
|
2018-10-14 10:21:06 +02:00 |
|
atm-ph
|
7b17b453bf
|
Fix sort and switch page
|
2018-10-12 23:29:35 +02:00 |
|
atm-ph
|
23e4cd57f3
|
Fix warnings PHP7
|
2018-10-12 23:27:38 +02:00 |
|
Laurent Destailleur
|
87f744896d
|
Merge pull request #9733 from ATM-Marc/FIX_6.0_propal_customcode
FIX: propal pdf: missing parenthesis for customs code
|
2018-10-12 21:14:40 +02:00 |
|
Laurent Destailleur
|
d4b02c0552
|
Release 6.0.8
|
2018-10-12 19:03:03 +02:00 |
|
Marc de Lima Lucio
|
afd9b4ea1a
|
FIX: propal pdf: missing parenthesis for customs code
|
2018-10-12 18:19:17 +02:00 |
|
Frédéric FRANCE
|
c3f07dd2e0
|
define $code for all execution paths
|
2018-10-09 19:28:52 +02:00 |
|
Laurent Destailleur
|
430f833222
|
Merge pull request #9626 from OPEN-DSI/fix_product_margin
FIX Product margin tab and credit note
|
2018-10-09 16:57:08 +02:00 |
|
Marc de Lima Lucio
|
82651cd920
|
FIX: invoice stats: situation invoices were not counted
|
2018-10-05 12:12:04 +02:00 |
|
atm-greg
|
583ea05567
|
fix missing letter...
|
2018-10-03 12:13:53 +02:00 |
|
Philippe
|
06fe172669
|
FIX Product marge tabs on product card
Credit note are not negative so the grand total are false
|
2018-09-27 20:06:00 +02:00 |
|
Philippe
|
8deb2eaa0c
|
Merge branch '6.0' of https://github.com/Dolibarr/dolibarr into 6.0
|
2018-09-27 19:00:09 +02:00 |
|
Laurent Destailleur
|
4c8664b297
|
Merge pull request #9619 from ATM-Marc/FIX_6.0_extrafield_columns
FIX: showOptionals: column mismatches
|
2018-09-27 09:39:51 +02:00 |
|
Laurent Destailleur
|
2d88b69cf6
|
Merge pull request #9616 from frederic34/patch-14
add try catch for swiftmailer
|
2018-09-27 09:34:21 +02:00 |
|
Marc de Lima Lucio
|
af93fc7484
|
FIX: showOptionals: column mismatches
|
2018-09-26 17:19:06 +02:00 |
|
Frédéric FRANCE
|
1bac3a0ccf
|
swiftmailer is doing encodetorfc2822
|
2018-09-26 10:37:20 +02:00 |
|
Frédéric FRANCE
|
92a3faeaf7
|
add try catch for swiftmailer
|
2018-09-26 10:13:14 +02:00 |
|
Frédéric FRANCE
|
d15c52db3b
|
Update rssparser.class.php
|
2018-09-25 08:16:05 +02:00 |
|
Laurent Destailleur
|
2dbb82fc76
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
|
2018-09-24 10:03:21 +02:00 |
|
Laurent Destailleur
|
12690666e2
|
Missing trans
|
2018-09-24 10:03:08 +02:00 |
|
Laurent Destailleur
|
a0bc26a923
|
Merge pull request #9476 from atm-maxime/fix_invoicelist_creditnote
Fix invoicelist creditnote
|
2018-09-21 09:56:43 +02:00 |
|
gauthier
|
d62118dca8
|
FIX : langs fr
|
2018-09-19 14:53:56 +02:00 |
|
Frédéric FRANCE
|
cdbb79a26c
|
correct typo in multicurrency doc pdf
|
2018-09-19 09:26:56 +02:00 |
|
gauthier
|
7838b75ec9
|
FIX : wrong var name
|
2018-09-13 16:11:42 +02:00 |
|
Maxime Kohlhaas
|
c94689e9a9
|
FIX remain to pay for credit note was wrong on invoice list
|
2018-09-12 11:53:57 +02:00 |
|
Laurent Destailleur
|
f7d5172a74
|
Merge pull request #9410 from frederic34/patch-10
Create index.html
|
2018-09-05 14:15:22 +02:00 |
|
Frédéric FRANCE
|
2015268b7e
|
Create index.html
|
2018-09-04 22:06:24 +02:00 |
|
Frédéric FRANCE
|
e4afd4af00
|
Create index.html
|
2018-09-04 22:05:06 +02:00 |
|
Laurent Destailleur
|
252335318f
|
Update pdf.lib.php
|
2018-09-04 09:57:01 +02:00 |
|
Marc de Lima Lucio
|
e285b42a18
|
FIX: PDF address: handle when contact thirdparty different from document thirdparty
|
2018-09-03 17:57:30 +02:00 |
|
atm-greg
|
f8fef61075
|
remove useless db begin
|
2018-08-30 09:19:44 +02:00 |
|
Laurent Destailleur
|
275b9a9960
|
Merge pull request #9325 from frederic34/patch-12
Fix allow barcode with special char
|
2018-08-29 18:01:15 +02:00 |
|
Frédéric FRANCE
|
24be0b7305
|
Update viewimage.php
code may have rich content (qrcode, datamatrix,...)
|
2018-08-29 13:08:52 +02:00 |
|
gauthier
|
61a57e619f
|
FIX : $fk_account is always empty, must be $soc->fk_account
|
2018-08-28 16:54:04 +02:00 |
|
Laurent Destailleur
|
009424cd67
|
Merge pull request #9226 from atm-greg/Fix_project_delete_tasks
Fix project delete tasks
|
2018-08-21 13:11:00 +02:00 |
|
Laurent Destailleur
|
91bfa4be6c
|
Update project.class.php
|
2018-08-21 13:10:20 +02:00 |
|
Laurent Destailleur
|
3523c2b3d2
|
Update project.class.php
|
2018-08-21 13:09:06 +02:00 |
|
florian HENRY
|
20309665e6
|
fix : ODT project substitution
|
2018-08-14 10:45:08 +02:00 |
|
atm-greg
|
ba6f7d4b0a
|
fix infinite loop
|
2018-08-14 09:32:43 +02:00 |
|
Laurent Destailleur
|
61a5be6e2a
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
|
2018-08-12 19:19:21 +02:00 |
|
Laurent Destailleur
|
b81b6b651f
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
|
2018-08-12 19:17:26 +02:00 |
|
florian HENRY
|
06189f8153
|
Merge branch '6.0' into 6.0_fhe
|
2018-08-09 18:31:59 +02:00 |
|
atm-greg
|
3d84adbd76
|
fix recurcivity
|
2018-08-09 12:21:48 +02:00 |
|
atm-greg
|
4e16f64af0
|
Fix project::delete to delete children tasks before parent tasks
|
2018-08-09 12:13:06 +02:00 |
|
Laurent Destailleur
|
e85ec19018
|
Merge pull request #9093 from atm-gauthier/FIX_filters
FIX : page must always be 0 when we search
|
2018-08-02 17:48:35 +02:00 |
|
Laurent Destailleur
|
b5a0e14ffe
|
Merge pull request #9185 from atm-john/fix_situation_total_calcul
Important: fix situation line's total
|
2018-08-02 17:45:44 +02:00 |
|
florian HENRY
|
ceb85cfa45
|
fix : odt project and task extrafields management
|
2018-07-31 17:29:08 +02:00 |
|
John BOTELLA
|
4ddca02bb9
|
fix situation line's total
|
2018-07-31 14:58:33 +02:00 |
|
Frédéric FRANCE
|
7dada7ae8e
|
fix #8820
|
2018-07-29 09:15:42 +02:00 |
|
Frédéric FRANCE
|
bde30b85ad
|
use defaut currency for supplier order
|
2018-07-24 17:06:12 +02:00 |
|
Laurent Destailleur
|
3bdf7d411d
|
Merge pull request #9125 from atm-john/fix_php7_warning_mysql
Fix: Warning: Use of undefined constant MYSQL_NUM - assumed 'MYSQL_NU…
|
2018-07-24 16:56:10 +02:00 |
|
Laurent Destailleur
|
8866b8eb1d
|
Merge pull request #9133 from frederic34/patch-12
__NEXT_MONTH __PREVIOUS_MONTH give day instead month
|
2018-07-24 16:54:04 +02:00 |
|
Frédéric FRANCE
|
4341e367d2
|
remove % in supplier order pdf
|
2018-07-23 10:30:28 +02:00 |
|
Frédéric FRANCE
|
d582f72bd9
|
__NEXT_MONTH __PREVIOUS_MONTH give day instead month
|
2018-07-22 17:27:02 +02:00 |
|
John BOTELLA
|
1e986bc39a
|
Fix: Warning: Use of undefined constant MYSQL_NUM - assumed 'MYSQL_NUM' (this will throw an Error in a future version of PHP)
|
2018-07-20 11:51:01 +02:00 |
|
gauthier
|
80ff7fa86f
|
FIX : case when we valid form with keyboard
|
2018-07-11 15:18:30 +02:00 |
|
gauthier
|
103c7e6d06
|
FIX : page must always be 0 when we search (to avoid case : when we're on page 3 and we're looking for a precise thirdparty, we stay on page 3 and nothing's displaied)
|
2018-07-11 09:51:36 +02:00 |
|
Marc de Lima Lucio
|
2ba7c07574
|
FIX: propal: correctly preset project when creating with origin/originid
|
2018-07-09 17:34:31 +02:00 |
|
John BOTELLA
|
1daba56bbc
|
Fix count(): Parameter must be an array or an object that implements Countable
|
2018-07-09 10:05:53 +02:00 |
|
Laurent Destailleur
|
bc632c9ab7
|
Merge pull request #9019 from atm-gauthier/6.0_fix_getentity
FIX : getEntity project and not projet
|
2018-06-30 01:15:23 +02:00 |
|
Laurent Destailleur
|
a6c6bbe16d
|
Merge pull request #9029 from hregis/6.0_multicompany
Fix: broken feature with edit in place
|
2018-06-29 19:40:17 +02:00 |
|
Laurent Destailleur
|
3f2b3c0840
|
FIX #9032
|
2018-06-29 19:38:12 +02:00 |
|
Laurent Destailleur
|
c4143763be
|
Update step1.php
|
2018-06-29 19:23:17 +02:00 |
|
Regis Houssin
|
41709f07d0
|
Fix: #9032 Vulnerability
|
2018-06-29 18:18:10 +02:00 |
|
Regis Houssin
|
2d13b5b59d
|
Fix: broken feature with edit in place
|
2018-06-29 15:57:34 +02:00 |
|
gauthier
|
d8ca9f2947
|
FIX : we must see number of all shared projects
|
2018-06-27 17:26:04 +02:00 |
|
gauthier
|
86a58def3b
|
FIX : getEntity project and not projet
|
2018-06-27 17:13:50 +02:00 |
|
Regis Houssin
|
8fc2f7441c
|
Fix: to avoid deleting line breaks
|
2018-06-20 09:06:16 +02:00 |
|
Laurent Destailleur
|
5d6d43d539
|
Merge pull request #8964 from atm-gauthier/6.0_accounting_entity
FIX : need to filter on aa.entity for same accounting accounts available in several entities
|
2018-06-18 14:30:55 +02:00 |
|
gauthier
|
fed61930d5
|
FIX : clause must not be there
|
2018-06-18 11:37:15 +02:00 |
|
Laurent Destailleur
|
95dfa1f7aa
|
Merge pull request #8973 from altatof/FIX_HTML_DETECTION
Fix <br/> detection
|
2018-06-18 10:42:02 +02:00 |
|
Laurent Destailleur
|
63fb82931c
|
Update functions.lib.php
|
2018-06-18 10:41:11 +02:00 |
|
altatof
|
5d6cd381b9
|
Fix <br/> detection
|
2018-06-15 15:59:14 +02:00 |
|
gauthier
|
e9d65ea751
|
FIX : need to filter on aa.entity for same accounting accounts available in several entities
|
2018-06-14 11:56:22 +02:00 |
|
Laurent Destailleur
|
09c92b7cc8
|
Merge pull request #8936 from atm-gauthier/6.0_fix_dont_remove_all_fourn_rights
FIX : If we enable 3 steps for supplier order approbation, we must no…
|
2018-06-13 21:36:01 +02:00 |
|
Laurent Destailleur
|
c586f2ecf7
|
Merge pull request #8957 from altatof/FIX_TOTAL_HT_DEVISE
FIX : pu_ht_devise was not converted to numeric so decimals were lost when calculating total_ht_devise
|
2018-06-13 21:20:42 +02:00 |
|
Laurent Destailleur
|
b5cd722eb1
|
Merge pull request #8917 from atm-gauthier/6.0_fix_apply_reduc
FIX : sometimes amounts are identical but php find them different.
|
2018-06-13 20:34:59 +02:00 |
|
Laurent Destailleur
|
5fcfad5966
|
Merge pull request #8918 from atm-gauthier/6.0_fix_entity_select_prod_fourn_prices
FIX : entity test must be on product_fourn_price table and not product table
|
2018-06-13 20:08:25 +02:00 |
|
altatof
|
d42f00bca9
|
FIX : pu_ht_devise was not converted to numeric so decimals were lost
when clculating total_ht_devise
|
2018-06-13 16:35:52 +02:00 |
|
gauthier
|
baf9d4a806
|
FIX : If we enable 3 steps for supplier order approbation, we must not delete all fourn rights def.
|
2018-06-08 17:11:59 +02:00 |
|
Laurent Destailleur
|
4c21ad4e4e
|
FIX: dol_delete_file must work in a context without db handler loaded
Conflicts:
htdocs/core/lib/files.lib.php
|
2018-06-05 18:12:14 +02:00 |
|
gauthier
|
45ecb0258b
|
FIX : entity test must be on product_fourn_price table and not product table
|
2018-06-05 12:41:38 +02:00 |
|
gauthier
|
77e7932671
|
FIX : sometimes amounts are identical but php find them different.
|
2018-06-05 11:33:58 +02:00 |
|
florian HENRY
|
b996237142
|
fix: when agenda is filterd with "todo" event, do not display "not
applicable" event
|
2018-05-30 13:37:17 +02:00 |
|
Laurent Destailleur
|
60321aabd8
|
Fix regression
|
2018-05-30 11:59:23 +02:00 |
|
Laurent Destailleur
|
7590df85e6
|
Merge pull request #8887 from atm-florian/6.0
add hook on balence pages
|
2018-05-30 10:47:59 +02:00 |
|
Laurent Destailleur
|
e57ceab5de
|
Update fournisseur.commande.class.php
|
2018-05-30 10:45:06 +02:00 |
|
florian HENRY
|
b65b545e0f
|
add hook on balence pages
|
2018-05-29 16:29:14 +02:00 |
|
ATM-Nicolas
|
6b0b975ffd
|
FIX : Keep supplier proposal price for supplier order
|
2018-05-29 11:21:30 +02:00 |
|
Laurent Destailleur
|
1a1f0fbc62
|
Merge pull request #8839 from ATM-Nicolas/fix_shipping_fetch
FIX : Fetch shipping will now fetch project id
|
2018-05-25 11:46:06 +02:00 |
|
Laurent Destailleur
|
131ddd6984
|
Merge pull request #8827 from ATM-Marc/FIX_shipment_fk_project
FIX: shipment: fk_proje(c)t not handled in fetch() and update() methods
|
2018-05-25 11:12:39 +02:00 |
|
Laurent Destailleur
|
b25c7e44d3
|
Merge pull request #8816 from atm-gauthier/6.0_fix_test_before_delete_invoice
FIX : test is_erasable() must be done before call function delete()
|
2018-05-25 11:05:20 +02:00 |
|
Laurent Destailleur
|
0a581e48d4
|
Update card.php
|
2018-05-25 11:04:04 +02:00 |
|