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

56669 Commits

Author SHA1 Message Date
Regis Houssin
156d26ddb9 Fix: backward compatibility 2018-04-05 13:00:50 +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
88b3e08b22 FIX filter/sorting on extrafield on contact list from contact tab 2018-04-05 11:34:26 +02:00
Laurent Destailleur
7c70f9ed03 Fix option STOCK_SUPPORTS_SERVICES 2018-04-03 20:23:47 +02:00
Maxime Kohlhaas
0c3b92f09a Better fix 2018-04-03 14:53:57 +02:00
Maxime Kohlhaas
39eab6d88d Fix service creation, right is tested regarding the product type 2018-04-03 14:38:20 +02:00
Laurent Destailleur
8595d7621b Fix POST mut use method POST no GET 2018-04-02 23:30:23 +02:00
Laurent Destailleur
fba40575f7 Remove dead code 2018-04-02 16:39:48 +02:00
Regis Houssin
c720345e6d Fix: better test 2018-04-01 11:47:10 +02:00
Regis Houssin
20e80a58a8 Fix: limit access to internal users 2018-04-01 11:43:39 +02:00
Laurent Destailleur
84bb4c6ad7 FIX With x extrafields, request for multicompany label was done x times 2018-03-30 19:51:53 +02:00
Laurent Destailleur
2e22c13062 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-03-29 15:31:35 +02:00
Laurent Destailleur
fdfcb96176 Fix length of combobox 2018-03-29 15:31:21 +02:00
Laurent Destailleur
0e986b8f97
Update societe.class.php 2018-03-29 13:48:09 +02:00
Laurent Destailleur
839ebb428b
Merge pull request #8477 from ggg44473/7.0 
Fix wrong approve time in expense report
 2018-03-29 13:40:33 +02:00
Laurent Destailleur
92cbcd9ccb
Merge pull request #8462 from atm-florian/7.0 
Fix error log
 2018-03-29 13:38:35 +02:00
Laurent Destailleur
188e5d286d Fix statut 2018-03-29 13:28:29 +02:00
Laurent Destailleur
072b6c02c0 FIX Test on mandatory status when closing proposal failed 2018-03-29 13:25:03 +02:00
Laurent Destailleur
b806b85761 Fix field filtert is set twice 2018-03-29 11:15:50 +02:00
florian HENRY
cc7deb0add Merge branch '7.0' of https://github.com/Dolibarr/dolibarr.git into 7.0 2018-03-29 09:36:05 +02:00
florian HENRY
78812ef826 better error management 2018-03-29 09:35:47 +02:00
Sean Wang
3dd9d47089 Fix wrong approve time in expense report 
The approve time showed was 8 hours more than the real time.
Checking database turned out that it had the wrong data(+8 hours).

After checking every timezone related settings were correct,
I found that it do twice idate() in setApproved().
Since we have idate() in $sql, we don't need the idate()
at the line 1249.
 2018-03-29 14:49:06 +08:00
Laurent Destailleur
125085acee Fix name of method to avoid ci errors 2018-03-29 03:01:05 +02:00
atm-ph
a89983ef5c Fix error on creating company with external module in 'custom' folder with a file to generate accountancy code 2018-03-28 15:41:10 +02:00
florian HENRY
7635f23d78 Merge branch '7.0' of https://github.com/Dolibarr/dolibarr.git into 7.0 2018-03-27 18:39:56 +02:00
florian HENRY
af7c1d8da1 fix error log 2018-03-27 18:39:18 +02:00
Frédéric FRANCE
299c32d262 Update actions_sendmails.inc.php 2018-03-27 18:02:27 +02:00
Laurent Destailleur
34fae0bd48
Merge pull request #8456 from atm-greg/Fix_bankentries_list 
FIX sql error using no category
 2018-03-27 17:49:01 +02:00
Bruno Généré
925e0c46dd BUG - Point of sale - buttons for cheque and CB are not displayed properly when one account is not defined 
I find out in the point of sale module that when you have an account for CB but not for check than you could use check but not CB.
It seems quite obvious when you look to the previous code that a mistake was done.
This is now fixed I expect.
The workaround for now is to define both default accounts (for check and for CB).
 2018-03-27 17:13:25 +02:00
Laurent Destailleur
460344fbfb Traduction 2018-03-27 16:02:06 +02:00
Laurent Destailleur
51cd793d80 Fix log and duplicate vat_by_date function 2018-03-27 14:37:29 +02:00
Laurent Destailleur
f9ee2930e2 FIX Data on income/expense report was always 0 2018-03-27 14:16:59 +02:00
Laurent Destailleur
0b13cd17ac FIX Some report have data when several chart of accounts exists 
FIX Detail per account not visible when total < 0
 2018-03-27 13:55:10 +02:00
Laurent Destailleur
2b588b9e43 FIX Initial month on report income/expense per predefined group 2018-03-27 13:37:40 +02:00
Laurent Destailleur
930512d9a2 FIX Add a test to avoid to reset binding by error. 2018-03-27 13:08:16 +02:00
Laurent Destailleur
56944115cb Hide a very dangerous feature. Should be useless. 2018-03-27 12:46:15 +02:00
Laurent Destailleur
dab8dbd671 FIX Binding pages must start on fiscal month not calendar month 2018-03-27 12:31:08 +02:00
Laurent Destailleur
88939a8469 FIX Draft invoice must be excluded from report 2018-03-27 11:10:12 +02:00
atm-greg
91d6a1b621 fix sql error using no category 2018-03-27 06:40:12 +02:00
Laurent Destailleur
89bf781fe6 FIX Add warning when expense report line not into range 
FIX Name of user not visible on journalizing expense report payments
FIX Only approved expense report must be journalized
 2018-03-26 14:13:40 +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
c85cb7fe0a
Merge pull request #8447 from fappels/7.0_modulbuilder 
Update on module builder
 2018-03-24 16:41:43 +01:00
Laurent Destailleur
d63c8356f4
Merge pull request #8437 from hregis/7.0_bug6 
Fix: uniformize getEntity('intervention')
 2018-03-24 16:36:27 +01:00
Laurent Destailleur
224fa1c03e Fix external links ko when substitution key are inside domain 2018-03-24 12:48:33 +01:00
Laurent Destailleur
a3c199e9e3 FIX Missing include 2018-03-24 12:48:19 +01:00
fappels
caa43ae2f6 Make helper methods available for derived classes. 
Use-case: a module build with modulebuilder can make it's own fetch
method using the helper methods.
 2018-03-23 17:35:46 +01:00
Laurent Destailleur
83b6dd4cb9 Prepare 7.0.2 2018-03-23 16:17:56 +01:00
Laurent Destailleur
a15abb2ded Update lang 2018-03-23 16:17:28 +01:00
Laurent Destailleur
c12469860a Update lang 2018-03-23 16:17:10 +01:00
florian HENRY
11446fb2f7 Merge branch '6.0' of https://github.com/Dolibarr/dolibarr.git into 6.0 2018-03-22 23:26:37 +01:00
florian HENRY
46d2b4d62d fix security check on fourn card 2018-03-22 23:25:54 +01:00
Laurent Destailleur
9f67bb0aa3 Start 6.0.7 2018-03-22 21:58:24 +01:00
Regis Houssin
9cf66e53f6 Fix: wrong module name 2018-03-22 16:39:47 +01:00
Regis Houssin
b5f37301a5 Fix: uniformize getEntity('intervention') 2018-03-22 16:28:00 +01:00
Laurent Destailleur
87815265c8 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-03-22 14:19:56 +01:00
Laurent Destailleur
a9944e1d23 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	ChangeLog
	htdocs/contrat/card.php
 2018-03-22 14:19:34 +01:00
Laurent Destailleur
ed2d9f179b Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	htdocs/contrat/card.php
 2018-03-22 14:12:37 +01:00
Laurent Destailleur
99d88b0fa9
Merge pull request #8435 from enstentechnologies/7.0 
FIX PropalStatusValidatedShort missing in langs/en_US/propal.lang
 2018-03-22 14:04:40 +01:00
Laurent Destailleur
0bb7d4d494
Update propal.lang 2018-03-22 14:04:33 +01:00
Laurent Destailleur
a7cb811b39
Merge pull request #8431 from fappels/7.0_fix_products_translation 
Fix products translation
 2018-03-22 13:51:37 +01:00
vabeltran
3793fd69e6 FIX PropalStatusValidatedShort missing in langs/en_US/propal.lang 
Added PropalStatusValidatedShort value, missing in lang/en_US/propal.lang file.
 2018-03-22 13:18:06 +01:00
Laurent Destailleur
658b145ff4 Missing translation 2018-03-22 13:16:38 +01:00
Laurent Destailleur
68a4058387 Fix translation 2018-03-22 13:03:12 +01:00
fappels
3765bc4775 Fix html escape for edit label 2018-03-22 10:48:03 +01:00
fappels
9e4a66b1a9 Fix hidden oprion PRODUCT_USE_OTHER_FIELD_IN_TRANSLATION 2018-03-22 10:46:54 +01:00
Laurent Destailleur
227b830aa2 Fix visible rounding of abandonned amount 2018-03-22 09:41:30 +01:00
florian HENRY
1feb22ea9c fix user right on modRessource 2018-03-21 22:24:11 +01:00
Laurent Destailleur
b3bb6d88e6 Fix list of leave not complete for a manager 2018-03-21 19:17:42 +01:00
atm-ph
2094c48b7f Fix missing folder with multientity 2018-03-21 12:14:04 +01:00
atm-ph
cad7bdc74b Fix documents are lost if we rename contrat ref 2018-03-21 11:54:25 +01:00
Laurent Destailleur
a2b9dbfbe3 Fix list must show only employee 2018-03-21 11:13:28 +01:00
Laurent Destailleur
891ebc0e7c Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-03-21 10:59:59 +01:00
Laurent Destailleur
04199c2b4b Fix according to mail of Olivier Geffroy the 21th of march 2018-03-21 10:59:13 +01:00
Laurent Destailleur
ac35acb273 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-03-20 20:04:20 +01:00
Laurent Destailleur
fe53ff56ee FIX Error management in leave request 2018-03-20 20:03:44 +01:00
Laurent Destailleur
11d33c8dcc
Merge pull request #8420 from hregis/7.0_bug3 
Fix: better compatibility with all hostname syntax
 2018-03-20 17:32:14 +01:00
Laurent Destailleur
a3a416aa7a Can remove comment added due to lack of test 2018-03-20 16:46:09 +01:00
Laurent Destailleur
78b4492f1e FIX Permission in list of holiday 
Conflicts:
	htdocs/holiday/list.php
 2018-03-20 14:46:46 +01:00
Laurent Destailleur
8214e7bb42 Fix missing security restiction test 2018-03-20 14:32:24 +01:00
Laurent Destailleur
896a1cbc24 Fix bad var init 2018-03-20 11:27:47 +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
a325bbf865 FIX Input of holiday for subordinates was ko 2018-03-19 20:46:43 +01:00
Laurent Destailleur
0dc8d3cb00 Fix trad 2018-03-19 18:53:33 +01:00
Regis Houssin
4767819b7a Fix: better compatibility with all hostname syntax 2018-03-19 17:59:23 +01:00
Laurent Destailleur
14e80948b8 FIX approval date was not visible if leave was canceled after 2018-03-19 17:53:33 +01:00
Laurent Destailleur
ee3dcb724f FIX email use the validate user instead of approver in holiday approval 
email.
 2018-03-19 17:20:44 +01:00
Laurent Destailleur
73eba91756 Fix translation of email message 2018-03-19 17:06:59 +01:00
Laurent Destailleur
91cc3d1b73 FIX navigation and filters on holiday list 2018-03-19 16:11:42 +01:00
Laurent Destailleur
e0164884ee Better management of hidden option HOLIDAY_HIDE_BALANCE 2018-03-19 15:13:36 +01:00
Laurent Destailleur
eb03fb7540 Fix trad/compatibility 2018-03-19 15:00:50 +01:00
Laurent Destailleur
ac9ab7b228 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-03-19 14:10:17 +01:00
Laurent Destailleur
8889e7f4b2 FIX translation of holiday types 2018-03-19 14:09:44 +01:00
Laurent Destailleur
eb7886ecff
Update ldap.class.php 2018-03-19 12:37:53 +01:00
Regis Houssin
890d0b6685 Fix: replace ldaps:// by ssl:// 2018-03-19 12:11:59 +01:00
Laurent Destailleur
0013e9d83b FIX Make a redirect after the remove_file action to avoid deletion done 
at next action too.
 2018-03-19 11:29:36 +01:00
Laurent Destailleur
8e72ddc89b FIX missing email of customer in stripe info payments 2018-03-19 10:18:03 +01:00
Laurent Destailleur
8e50e63243 Fix translation 2018-03-18 20:32:18 +01:00
Laurent Destailleur
e55c90b015 Fix translation 2018-03-18 20:29:36 +01:00
Laurent Destailleur
99ac06b0b8 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-03-18 20:22:22 +01:00
Laurent Destailleur
b4881645d8 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/core/lib/functions.lib.php
 2018-03-18 20:21:59 +01:00
Laurent Destailleur
0dd33440d1
Merge pull request #8397 from hregis/7.0_bug3 
Fix: missing update of $conf
 2018-03-18 12:29:58 +01:00
Regis Houssin
c0a6ae2195 Fix: replace with dolibarr_install_syslog 2018-03-16 18:31:11 +01:00
Laurent Destailleur
bbb095bcb2 FIX css 2018-03-16 12:19:16 +01:00
Laurent Destailleur
07fb29f0c4 Fix var not initialized 2018-03-16 12:18:20 +01:00
Laurent Destailleur
46e8692620 Escape db 2018-03-16 12:17:20 +01:00
Laurent Destailleur
ff765a2efe FIX Look and feel v7 2018-03-16 12:16:40 +01:00
Laurent Destailleur
96ff5b1b23 Update sql image file for 7.0 stable 2018-03-16 11:19:58 +01:00
arnaud
32ce42610a FIX show status on societe banner 2018-03-16 11:18:00 +01:00
Laurent Destailleur
fe94562a56 Prepare 7.0.1 2018-03-16 01:33:11 +01:00
Laurent Destailleur
a94017ba25 FIX letter for month March 2018-03-16 00:07:00 +01:00
Laurent Destailleur
ce7da41bef Fix save setup 2018-03-15 23:47:16 +01:00
Regis Houssin
6e585869c7 Fix: better method for avoid lost global 2018-03-15 19:33:08 +01:00
Regis Houssin
9f62ddaf36 Fix: missing update of $conf 2018-03-15 19:24:34 +01:00
Laurent Destailleur
ce0144e645 Add code to help debug 2018-03-15 13:21:02 +01:00
Laurent Destailleur
542eb2e5f4 Comment 2018-03-15 13:19:29 +01:00
Laurent Destailleur
85e307d6b8 Fix report when group is not dedicated to a country 2018-03-15 12:31:24 +01:00
Laurent Destailleur
73005d81a7 FIX country must not be mandatory for accounting report groups 2018-03-15 11:42:59 +01:00
Laurent Destailleur
97c8504915 Fix remove log 2018-03-15 10:26:06 +01:00
Laurent Destailleur
c4eea1f0e0 Fix SQLi 2018-03-15 02:12:01 +01:00
Laurent Destailleur
4957ea9178 Fix SQLi reported by op7ica 2018-03-15 01:55:16 +01:00
Laurent Destailleur
6a70d268e0 Fix SQLi reported by op7ica 2018-03-15 01:22:32 +01:00
Laurent Destailleur
14a33af603
Merge pull request #8384 from fmarcet/7.0 
FIX Activate all also if there are inactive services
 2018-03-15 00:37:37 +01:00
Laurent Destailleur
c69f5843da
Update card.php 2018-03-15 00:36:56 +01:00
Laurent Destailleur
ffc91bdfdf
Merge pull request #8383 from ggg44473/7.0 
Add missing $mode in BookKeeping::createStd()
 2018-03-15 00:33:37 +01:00
fmarcet
5140c1c5d2 Fix: Merge categories when merging thirds 2018-03-14 13:25:05 +01:00
ATM-Nicolas
e801b5a431 FIX : Delete tasks on project delete will now trigger TASK_DELETE 2018-03-14 11:38:42 +01:00
Ferran Marcet
4d4a204f7f Merge remote-tracking branch 'upstream/7.0' into 7.0 2018-03-14 11:11:54 +01:00
Ferran Marcet
e47dda72e7 Fix: Activate all also if there are inactive services 2018-03-14 11:08:38 +01:00
Laurent Destailleur
e7a315958d
Merge pull request #8381 from fmarcet/7.0 
FIX Can't activate tasks on projects configuration
 2018-03-14 10:42:45 +01:00
Ferran Marcet
304595ee4f Fix: Can't activate tasks on projects configuration 2018-03-14 09:48:39 +01:00
Sean Wang
9a1588df13 Add missing $mode in BookKeeping::createStd() 
In accountancy ledger, creating new transaction, there is
'ERROR: 55000: currval of sequence "llx_accounting_bookkeeping_rowid_seq"
is not yet defined in this session' occurred.

According to dolibarr.log, this error will show up after
createStd() {...Insert request to llx_accounting_bookkeeping_tmp...}.

It query the "llx_accounting_bookkeeping_rowid_seq" instead of
"llx_accounting_bookkeeping_tmp_rowid_seq",
due to missing $mode at bookkeeping.class.php
line504:last_insert_id().
 2018-03-14 16:38:22 +08:00
Laurent Destailleur
ca809a11af Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/commande/class/commande.class.php
 2018-03-13 18:04:18 +01:00
atm-quentin
af09a3714b FIX reverse field to have object loaded in doaction 2018-03-13 17:12:03 +01:00
Laurent Destailleur
f88536068f Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-03-13 15:30:07 +01:00
Laurent Destailleur
17b7c6268e FIX avoid "Array" on screen 2018-03-13 15:29:52 +01:00
ptibogxiv
4f6f0b302e
FIX for nondisplay of fk_element 's id in REST API response 
the fk_element don't display when the call is made with REST API (reason non found)
 2018-03-13 10:28:44 +01:00
Laurent Destailleur
dcd3387a30
Update commande.class.php 2018-03-13 09:53:21 +01:00
Laurent Destailleur
51229a602f
Update commande.class.php 2018-03-13 09:51:45 +01:00
atm-quentin
6c7a5cebdf FIX check verif exped on delete order 2018-03-13 09:34:50 +01:00
Laurent Destailleur
ae5080dab4 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-03-12 20:16:23 +01:00
Laurent Destailleur
d045dca003 Fix financial commitment 2018-03-12 20:04:25 +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
51c94fadfa Look and feel v7 2018-03-11 21:31:34 +01:00
Laurent Destailleur
e1654f4215 Fix division by zero 2018-03-11 21:18:18 +01:00
Laurent Destailleur
95e7062ca3 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-03-11 19:29:01 +01:00
Laurent Destailleur
d5d6939fd9 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	htdocs/core/class/commonobject.class.php
 2018-03-11 19:28:39 +01:00
Laurent Destailleur
a3d25b24d3 FIX #8285 Extrafields now reported by /api/index.php/agendaevents/{id} 2018-03-11 19:27:03 +01:00
Laurent Destailleur
5c4b5cc74f fix 2018-03-11 00:40:35 +01:00
Laurent Destailleur
9ed2e47775 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-03-11 00:32:41 +01:00
Laurent Destailleur
897b3f7b79 Fix setup 2018-03-11 00:31:26 +01:00
Laurent Destailleur
f98ca2e31a
Merge pull request #8335 from inoveaconseil/patch-1 
Fix #8092
 2018-03-11 00:06:28 +01:00
Laurent Destailleur
03f7df88c6
Update card.php 2018-03-11 00:05:32 +01:00
Inovea Conseil
c2397fad60
Fix #8092 2018-03-10 23:49:43 +01:00
Maxime Kohlhaas
c008853842 Fix #8057 2018-03-10 23:05:33 +01:00
Laurent Destailleur
6c9e0e1752
Merge branch '7.0' into 7.0 2018-03-10 21:52:57 +01:00
Alexis Algoud
74dc815bfa fix commonobject isInt for module builder capabilities 2018-03-10 19:02:06 +01:00
Laurent Destailleur
905cf112e9
Merge pull request #8327 from tiaris/fix7.0 
FIX #8289
 2018-03-10 18:58:22 +01:00
Laurent Destailleur
6fcc271790
Update product.class.php 2018-03-10 18:57:55 +01:00
Laurent Destailleur
aea3c164ba
Merge pull request #8178 from hregis/7.0_bug2 
Fix: avoid Warning: A non-numeric value encountered
 2018-03-10 18:47:11 +01:00
Laurent Destailleur
3911738b88 Fix vulnerability reported by DIGITEMIS CYBERSECURITY & PRIVACY 2018-03-10 18:40:45 +01:00
Laurent Destailleur
e3ace1f89f Fix morecss not provided 2018-03-10 18:17:54 +01:00
Laurent Destailleur
702c84a100 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-03-10 17:57:49 +01:00
Laurent Destailleur
241b5e9a93 FIX security report DIGITEMIS CYBERSECURITY & PRIVACY 2018-03-10 15:52:11 +01:00
BadPixxel
44d18027f2 BugFix for PHP7.1: PHP Warning: A non-numeric value encountered in /tmp/Dolibarr/htdocs/product/class/product.class.php on line 1709 2018-03-10 15:48:40 +01:00
BadPixxel
836054a8b3 BugFix Issue #8261: Variants module. Combinations cannot be edited 2018-03-10 14:51:24 +01:00
jean
6793bfae3a FIX #8289 add a cofoiguration for correct stopck calculation 2018-03-10 14:17:52 +01:00
Laurent Destailleur
a85a103a55
Merge pull request #8308 from atm-florian/7.0_fixinventory 
7.0 fixinventory
 2018-03-10 12:54:36 +01:00
Laurent Destailleur
212536a3fd
Update list.php 2018-03-10 12:54:20 +01:00
Laurent Destailleur
64f2f324de
Update card.php 2018-03-10 12:52:09 +01:00
Laurent Destailleur
a7f82af352
Update card.php 2018-03-10 12:49:25 +01:00
Laurent Destailleur
75b470b580
Update eldy.lib.php 2018-03-10 12:43:01 +01:00
Laurent Destailleur
04bcc4dd46
Update eldy.lib.php 2018-03-10 12:39:39 +01:00
Maxime Kohlhaas
fd36ade61a Fix unit in replenish #7225 2018-03-10 11:20:32 +01:00
Maxime Kohlhaas
d92fa3a69c Fix required field + space in dispatch 2018-03-09 23:49:40 +01:00
florian HENRY
c62904d632 Merge branch '7.0' of https://github.com/Dolibarr/dolibarr.git into 7.0_fixinventory 2018-03-09 23:41:32 +01:00
Laurent Destailleur
612b95b219
Merge pull request #8316 from atm-maxime/fix_clone_supplierorder 
Fix supplier order clone was keeping objectlinked
 2018-03-09 23:01:45 +01:00
Laurent Destailleur
31f36f4028
Merge pull request #8312 from atm-florian/7.0_fix8232 
7.0 fix8232
 2018-03-09 22:47:10 +01:00
Maxime Kohlhaas
d82c62b638 Fix supplier order clone was keeping objectlinked 2018-03-09 21:51:59 +01:00
TuxGasy
9eeb80151e Fix bug when updating multi currency rate on invoice supplier 2018-03-09 21:13:54 +01:00
Laurent Destailleur
143827ac79
Merge pull request #8306 from Robisix/7.0 
FIX Duplicate product_type asignement on order addline
 2018-03-09 19:45:47 +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
florian HENRY
f0164f2689 fix type date 2018-03-09 14:25:37 +01:00
florian HENRY
1c966d4769 on going 2018-03-09 12:57:58 +01:00
Romain DELVAL
ee55776886 FIX Duplicate product_type asignement on order addline 
On addline order method, ther is a duplicate assignation on
line->product_type before call to "insert" method.
The second assignement always make product_type to "0" while it was
fetched from product himsel like it was made on first asignement few
lines above
 2018-03-09 12:38:28 +01:00
florian HENRY
f37d482331 fix warning and sql error 2018-03-09 11:37:23 +01:00
atm-ph
53ce297ab3 Fix travis - missing documentation of new param 2018-03-09 09:30:11 +01:00
Laurent Destailleur
ad96229ec4 Fix not visible template selector for supplier order/invoice emails 
Conflicts:
	htdocs/fourn/facture/card.php
 2018-03-08 20:52:25 +01:00
Laurent Destailleur
af9fff4f83 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-03-08 16:35:12 +01:00
Laurent Destailleur
3762ed12c7 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/core/class/html.formfile.class.php
 2018-03-08 16:33:51 +01:00
Laurent Destailleur
343ca1bc77
Merge pull request #8294 from hregis/7.0_bug5 
Fix: avoid conflict between invoice and invoicenumber sharings
 2018-03-08 16:24:05 +01:00
Laurent Destailleur
7a7c4b8f14 Fix invalid url 2018-03-08 14:41:13 +01:00
Laurent Destailleur
d8dcebfa9a FIX Do not lose filter when editing comment of a time spent in task view 2018-03-07 20:12:40 +01:00
Laurent Destailleur
cab61724f2 Fix phpcs 2018-03-07 19:40:06 +01:00
Laurent Destailleur
317a5f5b2f Fix by adding a redirect to avoid the order2billing being done twice. 2018-03-07 19:15:23 +01:00
Laurent Destailleur
78259db0ee Intorduce dolDecodeBlockedData 2018-03-07 19:14:48 +01:00
Laurent Destailleur
69ef6a9316 Fix data on thirdparty tooltip 2018-03-07 19:13:54 +01:00
Laurent Destailleur
c02e8e9831 Css 2018-03-07 19:13:15 +01:00
Marc de Lima Lucio
884b74a6bb FIX: warning when adding ECM files using old photo path 2018-03-07 17:12:59 +01:00
Laurent Destailleur
acc29ea163 FIX #8219 2018-03-07 16:19:13 +01:00
Laurent Destailleur
f4f009d877 FIX #8269 2018-03-07 16:10:40 +01:00
Laurent Destailleur
eeb5b4b206 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-03-07 15:53:12 +01:00
Laurent Destailleur
b2f6105ae2 FIX #8277 2018-03-07 15:52:58 +01:00
Regis Houssin
a0774d523d Fix: avoid conflict between invoice and invoicenumber sharings 2018-03-07 15:24:23 +01:00
Laurent Destailleur
64e59c3f97
Merge pull request #8292 from hregis/7.0_bug6 
Fix: avoid error if type is not numeric
 2018-03-07 13:08:31 +01:00
Laurent Destailleur
f8d8c5c658 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-03-07 13:04:27 +01:00
Laurent Destailleur
004839b368 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-03-07 13:03:40 +01:00
Laurent Destailleur
8b9041b93e Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-03-07 13:02:18 +01:00
Laurent Destailleur
4caefbe926 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2018-03-07 12:59:52 +01:00
Laurent Destailleur
e518303e1b
Merge pull request #8288 from atm-florian/7.0_fix_comment_task 
FIX comment on tasks
 2018-03-07 12:40:31 +01:00
Laurent Destailleur
f7f9f0e605
Update comment.php 2018-03-07 12:40:09 +01:00
Laurent Destailleur
ee1a2c49fd
Merge pull request #8287 from hregis/7.0_bug3 
Fix: problem to see users with transverse mode
 2018-03-07 12:38:00 +01:00
Regis Houssin
0f574579eb Fix: avoid error if type is not numeric 2018-03-07 12:27:13 +01:00
Laurent Destailleur
2053cc9307
Merge pull request #8284 from hregis/7.0_bug5 
Fix: wrong entity id, always value 1 !
 2018-03-07 12:19:09 +01:00
Marc de Lima Lucio
dd208348c4 FIX: add planned delivery to order exports 2018-03-07 12:18:08 +01:00
alexis Algoud
cb27eb98e1 FIX natural search double quote 2018-03-07 11:42:47 +01:00
Laurent Destailleur
a0a9e12178 Fix css 2018-03-07 11:29:50 +01:00
Laurent Destailleur
f3fd5f4cfa FIX Label of event show twice 2018-03-07 11:03:35 +01:00
florian HENRY
6cb77577a6 can use image 2018-03-07 09:03:13 +01:00
florian HENRY
bb73a715a8 Merge branch '7.0' of https://github.com/Dolibarr/dolibarr.git into 7.0_fix_comment_task 2018-03-07 08:49:08 +01:00
florian HENRY
03873038d5 fix comment task 2018-03-07 08:47:34 +01:00
Laurent Destailleur
23a4a60970 Fix status of task 2018-03-06 21:51:43 +01:00
Laurent Destailleur
0dfc9af72a FIX multicompany compatibility and fix reports 2018-03-06 19:58:13 +01:00
Regis Houssin
bf4402eb89 Fix: missing superadmin 2018-03-06 19:22:59 +01:00
Regis Houssin
175971bfc1 Fix: syntax error 2018-03-06 19:12:18 +01:00
Regis Houssin
d406b28911 Fix: problem to see users with transverse mode 2018-03-06 19:08:39 +01:00
Regis Houssin
1807bb36e2 Fix: missing global $conf 2018-03-06 13:31:13 +01:00
Regis Houssin
35703cff99 Fix: wrong entity id, already value 1 ! 2018-03-06 13:23:00 +01:00
Laurent Destailleur
592a97f9a5 Fix default topic 2018-03-06 12:45:48 +01:00
Laurent Destailleur
45fd0cfc16 FIX Subscription events not recorded into agenda 2018-03-06 12:36:39 +01:00
Laurent Destailleur
72af963ed5 Fix triggers 2018-03-06 12:26:26 +01:00
Laurent Destailleur
1e6a55745c CSS 2018-03-06 11:54:05 +01:00
Laurent Destailleur
17e012e0ac FIX Subscription not correctly log in blockedlog 2018-03-06 09:08:45 +01:00
Laurent Destailleur
7c95233e3c FIX Trad and creation date in subscription create 2018-03-06 09:08:28 +01:00
Laurent Destailleur
14d7ffa53b Fix cancel and template to record stock movement/correction 2018-03-06 09:07:39 +01:00
Laurent Destailleur
6d13e58a23 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-03-06 09:07:03 +01:00
Laurent Destailleur
a765dba570 Fix trad 2018-03-06 09:06:49 +01:00
Laurent Destailleur
5de43d6652
Merge pull request #8273 from fappels/7.0_fix_insert_expedition_line 
Fix shipment line insert
 2018-03-05 20:47:03 +01:00
Laurent Destailleur
81e193b725
Update expedition.class.php 2018-03-05 20:46:54 +01:00
Laurent Destailleur
951babae6d
Merge pull request #8272 from aspangaro/7.0 
Fix : Missing language file
 2018-03-05 20:44:34 +01:00
Laurent Destailleur
65fe376bbf
Merge pull request #8270 from hregis/7.0_bug4 
Fix: avoid Warning: A non-numeric value encountered
 2018-03-05 20:44:23 +01:00
Laurent Destailleur
45898d26a8
Merge pull request #8267 from hregis/7.0_bug5 
Fix: check if file name already exists
 2018-03-05 20:44:02 +01:00
atm-ph
5971cd8e59 Fix label goes in desc and lost fourn ref 2018-03-05 17:18:03 +01:00
atm-ph
ebb4da8417 Fix keep supplier proposal price in supplier order 2018-03-05 16:58:35 +01:00
Laurent Destailleur
0b3e2e92e2 Revert "Fix SQL error when creating subscription" 
This reverts commit d422fc8a11.
 2018-03-05 16:13:32 +01:00
Laurent Destailleur
d422fc8a11 Fix SQL error when creating subscription 2018-03-05 16:09:26 +01:00
Laurent Destailleur
184c773301 Fix error management 2018-03-05 15:43:48 +01:00
Laurent Destailleur
f35679fb2a Fix description of field of table 2018-03-05 13:11:07 +01:00
Regis Houssin
722fbc9d29 Merge branch '7.0' of https://github.com/Dolibarr/dolibarr.git into 7.0_bug5 2018-03-05 10:25:23 +01:00