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

53010 Commits

Author SHA1 Message Date
Laurent Destailleur
9cc344f8cc Fix problem in type and customer code substitution in numbering module 2017-09-06 10:11:07 +02:00
fappels
5a75e14a8a Add supplier qty and supplier discount for export 2017-09-05 22:50:34 +02:00
fappels
f5e14c9d70 Transfer of customer order line extrafield should only transfer fields available in target 2017-09-05 21:41:49 +02:00
fappels
237270a27e Add missing transfer of line extrafields in create invoice from supplier order 2017-09-05 21:40:04 +02:00
Laurent Destailleur
f5ccd943f1 Fix mix of collation 2017-09-05 20:13:33 +02:00
Juanjo Menent
53f5513476 FIX: Bad const name 2017-09-05 18:10:19 +02:00
Laurent Destailleur
e599e47e84 Missing translation 2017-09-05 13:06:34 +02:00
Jacques83300
52986c5c07 Add some missing attributes in Adherent:makeSubstitution (type, phone numbers) for use in substitution of tags 2017-09-04 15:59:50 +02:00
Laurent Destailleur
d4ff877fdd Prepare 6.0.1 2017-09-04 12:13:12 +02:00
Laurent Destailleur
d66fac5662 Prepare 5.0.7 2017-09-04 12:12:50 +02:00
Laurent Destailleur
67b5353861 Merge pull request #7327 from marcosgdf/bug-7000 
FIX #7000 Dashboard link for late pending payment supplier invoices do not work
 2017-09-04 10:54:58 +02:00
Laurent Destailleur
4dd58a94f3 Update list.php 2017-09-04 10:54:50 +02:00
Laurent Destailleur
1154f871f1 Update fiche-rec.php 2017-09-04 10:52:49 +02:00
Laurent Destailleur
61ee071f43 Fix regression 2017-09-04 10:17:51 +02:00
Laurent Destailleur
2c3a696b78 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-09-04 10:16:02 +02:00
Laurent Destailleur
f3b1f89bae Fix warning 2017-09-03 15:21:37 +02:00
Laurent Destailleur
3126676ffb FIX inert of extra field must not change extrafield values in memory 2017-09-03 14:27:46 +02:00
Marcos García
eb9e8c9dfc FIX #7000 Dashboard link for late pending payment supplier invoices do not work 
Close #7000
 2017-09-03 12:42:05 +02:00
Marcos García
ac7f1035e1 FIX #7325 Default VAT rate when editing template invoices is 0% 
Close #7325
 2017-09-03 12:25:27 +02:00
Laurent Destailleur
3108f5bf0d Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2017-09-03 01:00:30 +02:00
Laurent Destailleur
c108f11c01 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	build/makepack-dolibarr.pl
	htdocs/compta/bank/index.php
 2017-09-03 00:58:45 +02:00
Laurent Destailleur
09e9254f35 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2017-09-02 01:29:12 +02:00
Laurent Destailleur
7c722def0f FIX #7312 2017-09-02 01:28:19 +02:00
Laurent Destailleur
227c8a96c8 Merge pull request #7320 from hregis/6.0_bug3 
Fix: avoid warning "non-numeric value encountered"
 2017-09-02 00:09:24 +02:00
Laurent Destailleur
5ba13a9500 Merge pull request #7317 from hregis/6.0_bug2 
Fix: missing $dolibarrdataroot value
 2017-09-02 00:05:42 +02:00
Laurent Destailleur
d018bd4892 Merge pull request #7316 from aspangaro/6.0-rc_p4 
FIX Missing language key "Events" everywhere
 2017-09-02 00:00:10 +02:00
Laurent Destailleur
0d0b7f8af2 Fix email 2017-09-01 17:18:07 +02:00
Laurent Destailleur
4660bc58fc Fix nostop option 2017-09-01 17:08:47 +02:00
Laurent Destailleur
223e1b1cd4 Fix missing the nostop tag 2017-09-01 16:55:09 +02:00
Regis Houssin
0fc8a0f840 Fix: avoid warning "non-numeric value encountered" 2017-09-01 16:54:06 +02:00
Laurent Destailleur
2768878618 FIX Bad condition on sms log debug 2017-09-01 16:39:49 +02:00
Laurent Destailleur
ffb408f440 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-09-01 15:20:48 +02:00
Laurent Destailleur
ac08dec2c3 Avoid warnings 2017-09-01 15:20:29 +02:00
Maxime Kohlhaas
cf49c274a6 Better fix 2017-09-01 10:38:50 +02:00
Maxime Kohlhaas
1a956cce9a Fix : insert line extrafield 2017-09-01 10:31:22 +02:00
Regis Houssin
d9008cd302 Fix: missing $dolibarrdataroot value 2017-09-01 08:20:33 +02:00
Alexandre SPANGARO
be63eb8cef Fix : missing language key "Events" everywhere 2017-09-01 07:34:01 +02:00
Laurent Destailleur
2ab12f54ff Fix install error due to too large column with index 2017-08-31 22:42:14 +02:00
Laurent Destailleur
6a3d110d3a Enhance repair for utf8 mix collation 2017-08-31 14:44:32 +02:00
Laurent Destailleur
e71409b7c8 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2017-08-30 17:15:28 +02:00
Laurent Destailleur
0a67ca53d4 Fix menu auguria 2017-08-30 17:14:54 +02:00
Laurent Destailleur
b65db49868 Merge pull request #7309 from simnandez/6.0 
NEW Add detail of all tax rates into pdf column tax sale.
 2017-08-30 16:47:42 +02:00
Laurent Destailleur
3e4a7ba97c Update admin.lang 2017-08-30 16:46:50 +02:00
Laurent Destailleur
2c4e8cbb4a Update admin.lang 2017-08-30 16:45:53 +02:00
Laurent Destailleur
a3085cb44a Update objectline_view.tpl.php 2017-08-30 16:43:57 +02:00
Laurent Destailleur
c028771ad0 Merge pull request #7306 from aspangaro/6.0-rc_p2 
Fix: Bank index | Accountancy journal, fetch on rowid, not code
 2017-08-30 16:39:31 +02:00
Laurent Destailleur
70cbaeb423 Fix mass merging must read only PDF generated for REF. 2017-08-30 16:10:39 +02:00
Juanjo Menent
d5a9d32778 Merge remote-tracking branch 'upstream/6.0' into 6.0 2017-08-30 14:37:43 +02:00
Juanjo Menent
bfc5f01e1e NEW Add detail of all tax rates into pdf column tax sale. 
-Can be hidden by pdf setup page
-For know if localtax is applied into line we have to read totaltax line
 2017-08-30 14:36:00 +02:00
Laurent Destailleur
d3c95e030b Fix delete file not possible for external user even with permissions 2017-08-30 14:34:36 +02:00
Regis Houssin
45136de664 Fix: documents dir not rename and delete 2017-08-30 11:26:48 +02:00
Alexandre SPANGARO
4998eb3061 Fix: Accountancy journal, fetch on rowid, not code 2017-08-29 21:21:59 +02:00
Laurent Destailleur
991a33f7b6 Make different vat rates visible 2017-08-29 20:40:51 +02:00
Laurent Destailleur
2cf924ab74 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2017-08-29 19:56:03 +02:00
Laurent Destailleur
6c202c5fa1 Fix vat rate to show and not vat amount 2017-08-29 19:55:49 +02:00
Laurent Destailleur
8ca2bbecc6 Merge pull request #7305 from atm-quentin/6.0 
FIX createFromCurrent lastvalue
 2017-08-29 18:22:24 +02:00
Laurent Destailleur
945fb61e59 Update facture.class.php 2017-08-29 18:22:01 +02:00
Laurent Destailleur
044feab00f Fix duplicate code 2017-08-29 17:52:10 +02:00
Laurent Destailleur
dabd882056 Use a slash 2017-08-29 17:24:49 +02:00
Laurent Destailleur
e862ba9daf NEW Add detail of all tax rates into pdf column tax sale. 2017-08-29 17:22:03 +02:00
Laurent Destailleur
d96a83adac Fix bad total included tax when mutlicurrency is on 2017-08-29 16:37:00 +02:00
Laurent Destailleur
7218a9de0e Fix translation of total VAT 2017-08-29 13:52:24 +02:00
Laurent Destailleur
8f01db10a6 Fix setup for india 2017-08-29 13:41:55 +02:00
Laurent Destailleur
eebaff95cf Fix pb with imagick 2017-08-29 13:41:44 +02:00
Laurent Destailleur
22ca29a51f Fix sql syntax error 2017-08-29 13:32:25 +02:00
Laurent Destailleur
e9cdf85286 Fxi repeair of collation 2017-08-29 12:58:18 +02:00
atm-quentin
07f7db1b6d FIX createFromCurrent lastvalue 2017-08-29 11:22:50 +02:00
Laurent Destailleur
1523b2ef80 FIX #7222 2017-08-28 14:02:08 +02:00
Laurent Destailleur
075a138e14 Fix substitution of __EMAIL__ 2017-08-28 12:49:57 +02:00
Laurent Destailleur
73a799b0ce Merge pull request #7297 from hregis/6.0_bug2 
Fix: use resprint instead resarray
 2017-08-28 12:27:26 +02:00
Laurent Destailleur
3d5edba574 Merge pull request #7302 from aspangaro/6.0-rc_p1 
Fix: Search on supplier payment list doesn't work
 2017-08-28 12:24:22 +02:00
Laurent Destailleur
21a7fcb01a Fix substitution when sending emails 2017-08-28 12:18:18 +02:00
Regis Houssin
0ce51fcb87 Fix: add resprint for passwordforgotten 2017-08-28 09:14:50 +02:00
Regis Houssin
570c683b99 Merge branch '6.0' of https://github.com/Dolibarr/dolibarr.git into 6.0_bug2 2017-08-28 09:02:51 +02:00
Laurent Destailleur
1f64f9dfcc Merge pull request #7303 from hregis/6.0_background 
Fix: better for responsive background image
 2017-08-28 08:58:54 +02:00
Regis Houssin
b3642708b3 Fix: better for responsive background image 2017-08-28 08:28:58 +02:00
Alexandre SPANGARO
f6604f6578 Fix: Search on supplier payment list doesn't work 2017-08-28 06:16:31 +02:00
Laurent Destailleur
c382ca22b8 FIX link in to email and option for tls 2017-08-28 00:09:21 +02:00
Regis Houssin
80af01c20f Fix: wrong test 2017-08-27 13:57:52 +02:00
Regis Houssin
526ccc870b Fix: add compatibility with old modules 2017-08-27 13:53:08 +02:00
Regis Houssin
1ce1899a46 Fix: add comment 2017-08-27 13:42:46 +02:00
Regis Houssin
896c8b4a78 Fix: comment old code 2017-08-27 13:24:29 +02:00
Regis Houssin
d800d10766 Fix: use resprint instead resarray 2017-08-27 13:19:57 +02:00
Laurent Destailleur
7916a2a648 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	build/generate_filelist_xml.php
	htdocs/filefunc.inc.php
 2017-08-27 00:38:46 +02:00
Laurent Destailleur
ba3581354a Prepare 5.0.6 2017-08-27 00:35:00 +02:00
Laurent Destailleur
08da8ef09d Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2017-08-26 21:58:52 +02:00
Laurent Destailleur
4052e15565 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	htdocs/comm/action/card.php
 2017-08-26 21:58:29 +02:00
Laurent Destailleur
c91f70cbf4 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-08-26 21:53:46 +02:00
Laurent Destailleur
a01bb27d7e FIX install process with DoliWamp 2017-08-26 21:53:29 +02:00
Laurent Destailleur
3f806f83e3 Merge pull request #7293 from fappels/6.0_fix_product_list_supplier_prices 
FIX product list supplier prices not shown when best buy column hidden
 2017-08-26 19:35:01 +02:00
Laurent Destailleur
4445c34af0 Merge pull request #7287 from hregis/5.0_bug2 
Fix: (Agenda) Allowed if link to third party is empty
 2017-08-26 19:32:24 +02:00
Laurent Destailleur
782b85ba13 Merge pull request #7285 from hregis/6.0_bug 
Fix: avoid error "A non-numeric value encountered"
 2017-08-26 19:31:16 +02:00
Laurent Destailleur
91644d2145 Merge pull request #7278 from hregis/5.0_bug 
Fix: file delete link doesn't work
 2017-08-26 19:26:50 +02:00
Laurent Destailleur
98f5fbab5d Fix error on contact/address not linked on thirdparty 2017-08-25 13:50:45 +02:00
Laurent Destailleur
da34ea6b11 FIX field entity "edit" and "view" was in hook but not "create". 2017-08-25 13:31:55 +02:00
fappels
533881e620 Fix supplier prices not shown when best buy hidden 
only show value if item has supplier
 2017-08-25 11:58:34 +02:00
Laurent Destailleur
d8ead2693f Fix field position 2017-08-24 17:59:20 +02:00
Laurent Destailleur
7d9a18a63d Fix sql error 2017-08-24 15:39:23 +02:00
Laurent Destailleur
fbac1cfe1e Fix lang loading 2017-08-24 15:00:53 +02:00
Laurent Destailleur
9684c8b4bc Fix css 2017-08-24 14:54:32 +02:00
Laurent Destailleur
ef31c47c15 Fix clear filter 2017-08-24 14:22:45 +02:00
Laurent Destailleur
2416c387f5 Fix trad 2017-08-24 13:35:52 +02:00
Laurent Destailleur
326d3df63f FIX select of category 
FIX pb with extrafield list and key '0'

Conflicts:
	htdocs/core/class/extrafields.class.php
 2017-08-24 13:28:56 +02:00
Regis Houssin
982fca541d Fix: (Agenda) Allowed if link to third party is empty 2017-08-24 08:33:40 +02:00
Regis Houssin
ad39c30c21 Fix: change old email 2017-08-23 21:23:18 +02:00
Regis Houssin
7da1b215f3 Fix: avoid error "A non-numeric value encountered" 2017-08-23 21:01:14 +02:00
Laurent Destailleur
ab37794f61 Fix text 2017-08-23 19:34:26 +02:00
Laurent Destailleur
ccb5344d32 Fix links 2017-08-23 18:52:03 +02:00
Laurent Destailleur
9079d2890c Fix ajout du code devise Franc Pacifique 2017-08-23 18:13:42 +02:00
Laurent Destailleur
bf1f60b31e Merge 2017-08-23 17:14:29 +02:00
Laurent Destailleur
1b1d1a8d0b FIX #7156 2017-08-23 16:57:07 +02:00
Laurent Destailleur
947acfffe2 FIX #7173 2017-08-23 16:53:29 +02:00
Laurent Destailleur
6b5b10fc94 FIX #7224 2017-08-23 16:28:34 +02:00
Laurent Destailleur
f3ef6448d7 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	htdocs/admin/supplier_payment.php
	htdocs/core/lib/ajax.lib.php
	htdocs/don/admin/donation.php
	htdocs/product/admin/product.php
 2017-08-23 16:11:51 +02:00
Laurent Destailleur
52a8692a85 FIX #7226 2017-08-23 16:07:11 +02:00
Laurent Destailleur
29e656ec7e Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-08-23 15:06:30 +02:00
Laurent Destailleur
4da49dfc2d FIX #7239 2017-08-23 15:02:38 +02:00
Laurent Destailleur
e3370b6a98 FIX #7265 2017-08-23 12:47:59 +02:00
Laurent Destailleur
e25a428118 Fix compatibility with Internet Explorer 2017-08-23 12:32:28 +02:00
Regis Houssin
2492b9968a Fix: missing scandir 2017-08-23 10:21:10 +02:00
Regis Houssin
6dda2f3670 Fix: "scandir" in url is blocked in some providers 2017-08-23 10:07:00 +02:00
Laurent Destailleur
aae24c26a3 Some fixes with smartphones 2017-08-22 20:20:34 +02:00
Laurent Destailleur
97dbb40ad6 Fix syntax error 2017-08-22 18:42:35 +02:00
Regis Houssin
18ca96e285 Fix: file delete link doesn't work 2017-08-22 18:33:00 +02:00
Laurent Destailleur
206d46cbb7 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	scripts/cron/cron_run_jobs.php
 2017-08-22 11:18:17 +02:00
Laurent Destailleur
41ce4886fd Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-08-22 11:15:30 +02:00
BENKE Charlene
7c3640a4c3 Bad ojbject for extrafields 
https://www.dolibarr.fr/forum/527-bugs-sur-la-version-stable-courante/59536-extrafields-commande-dans-expedition
 2017-08-22 10:37:21 +02:00
Laurent Destailleur
ca3b3b9843 Merge pull request #7270 from atm-florian/6.0_fix 
6.0 fix
 2017-08-22 10:33:08 +02:00
Laurent Destailleur
9be342bd25 Fix missing $form 2017-08-22 10:02:45 +02:00
Laurent Destailleur
4a310f36d8 Fix help url 2017-08-22 08:12:30 +02:00
Laurent Destailleur
e647b5562b Fix hidden option EXPENSEREPORT_LINES_SORTED_BY_ROWID to restore 
compatibility.
 2017-08-21 23:41:32 +02:00
Laurent Destailleur
9ffcd9e922 Fix cover background size 2017-08-21 21:18:07 +02:00
Laurent Destailleur
599f6426a5 Fix link http 2017-08-21 20:49:12 +02:00
Laurent Destailleur
e8a2680e31 Sync transifex 2017-08-21 13:26:56 +02:00
Laurent Destailleur
f5993a2507 Better style 2017-08-21 12:51:48 +02:00
Laurent Destailleur
9782937138 Better info style 2017-08-21 12:25:38 +02:00
Laurent Destailleur
7aff424d1c Fix bad position of field 2017-08-21 12:24:58 +02:00
Laurent Destailleur
d7be62b7da Better style 2017-08-21 11:02:24 +02:00
Laurent Destailleur
84d584f607 Missing translation 2017-08-21 01:39:22 +02:00
Laurent Destailleur
68c31c55c5 FIX delete dir when there is symlinks 2017-08-21 01:26:22 +02:00
Laurent Destailleur
ac3a270e17 FIX Do not delete files into sym links 
Conflicts:
	htdocs/core/lib/files.lib.php
 2017-08-21 00:43:52 +02:00
Laurent Destailleur
aeba02fb22 Fix bad table alignement 2017-08-20 16:21:07 +02:00
Laurent Destailleur
1101a1094f Fix translation and migration 2017-08-20 16:07:38 +02:00
florian HENRY
874d61bb6d Other fix 2017-08-18 11:35:20 +02:00
florian HENRY
c793e847bc fix comondoc generator 2017-08-18 11:30:13 +02:00
Laurent Destailleur
398733ff9a Fix syntax error 2017-08-17 23:44:16 +02:00
Laurent Destailleur
744f0ab198 Merge remote-tracking branch 'origin/5.0' into 6.0 2017-08-17 22:03:26 +02:00
Laurent Destailleur
f2d5bcbbdd Merge pull request #7263 from simnandez/5.0 
FIX: Bad tax calculation with expense report
 2017-08-17 17:27:55 +02:00
Laurent Destailleur
323a6e34b5 Merge pull request #7250 from delcroip/patch-12 
FIX: remove order rights on invoice page
 2017-08-17 17:20:10 +02:00
Juanjo Menent
3330f040ba FIX: Bad tax calculation with expense report 2017-08-16 11:19:28 +02:00
Laurent Destailleur
4d26dffa7d FIX No way to add new line in supplier orders 2017-08-13 23:17:34 +02:00
Laurent Destailleur
9d4d85ca9d Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2017-08-11 19:58:09 +02:00
Laurent Destailleur
d37d1a033a Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	htdocs/compta/bank/bankentries.php
	htdocs/core/lib/admin.lib.php
	htdocs/install/mysql/migration/repair.sql
 2017-08-11 19:56:17 +02:00
Laurent Destailleur
dcd1a089b1 Merge pull request #7249 from delcroip/patch-11 
Reconcile take page number into account
 2017-08-11 17:08:40 +02:00
Laurent Destailleur
9ad2a9ac85 Merge pull request #7248 from fappels/4.0_fix_best_buy_price_calculation 
FIX Best buy price calculation
 2017-08-10 13:51:01 +02:00
Laurent Destailleur
5c53081007 Merge pull request #7244 from atm-john/new_resource_ref_mask 
FIX resource hooks
 2017-08-10 13:49:26 +02:00
Laurent Destailleur
f375c41950 Update card.php 2017-08-10 13:47:44 +02:00
Laurent Destailleur
2a59dbbc89 Merge pull request #7243 from altatof/fix_fourcard_hooks 
FIX : supplier id was not passed to hooks
 2017-08-10 13:44:43 +02:00
Laurent Destailleur
d5d92c6290 Update adherent_type.class.php 2017-08-10 12:59:01 +02:00
delcroix Patrick
e96eadb5e7 FIX: remove order rights on invoice page 2017-08-09 23:15:49 +02:00
delcroix Patrick
593d06e91e Reconcile take pqge number into account 2017-08-09 22:24:06 +02:00
fappels
ca3cdfabec FIX Best buy price calculation 
Best buy price also depends on buy discount.
 2017-08-09 14:15:26 +02:00
Laurent Destailleur
bfa8630feb Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0 2017-08-07 20:07:36 +02:00
Laurent Destailleur
0bf4ac6fb3 Add missing field fk_supplier_proposal 2017-08-07 20:06:26 +02:00
Laurent Destailleur
a7c1ff402a Fix picto on support page 2017-08-07 16:06:38 +02:00
Laurent Destailleur
0960473c9b More complete repair of unicode field 2017-08-07 15:51:30 +02:00
Laurent Destailleur
fd38a55f51 FIX amount overlap other amount when a pagebreak is done due to an image 
at the bottom of page.
 2017-08-07 15:49:54 +02:00
John
76bee57553 Fix Add doaction hook 2017-08-07 15:49:17 +02:00
John
d791476708 Fix doaction call 2017-08-07 15:47:55 +02:00
Laurent Destailleur
975fd0a6d3 Fix font size 2017-08-07 15:43:42 +02:00
altatof
2be75420ca FIX : supplier id was not passed to hooks 2017-08-07 10:21:38 +02:00
Laurent Destailleur
c2a89ae58e Code comment 2017-08-04 22:58:52 +02:00
Laurent Destailleur
1c157c7c3d Fix pb with mix collation. Add a way to fix this in repair. 2017-08-04 21:23:40 +02:00
Laurent Destailleur
a3b5caaae0 Prepare rc 2017-08-04 18:41:05 +02:00
Laurent Destailleur
e039f7cc22 Complete repair script 2017-08-04 16:37:24 +02:00
Laurent Destailleur
06e35149f7 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2017-08-04 15:32:40 +02:00
Laurent Destailleur
7c840b8348 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2017-08-04 15:32:30 +02:00
Laurent Destailleur
5e305a0c9d Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-08-04 15:32:01 +02:00
Laurent Destailleur
a7dda865c9 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-08-04 15:29:54 +02:00
Laurent Destailleur
51a3946519 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0 2017-08-04 15:29:18 +02:00
Laurent Destailleur
a3beceade2 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 2017-08-04 15:28:55 +02:00
Laurent Destailleur
d345b9503a Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2017-08-04 15:28:03 +02:00
Laurent Destailleur
c72bed6290 Merge pull request #7236 from atm-john/FIX_contract_edit_btn_if_no_service 
Fix contract reopen btn if no contract line
 2017-08-04 15:27:36 +02:00
Laurent Destailleur
e62bb89d95 Merge pull request #7235 from atm-john/FIX_service_list_contract_ref_search 
Fix ref search
 2017-08-04 15:26:19 +02:00
Laurent Destailleur
f8d6eb0d40 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9 2017-08-04 15:25:41 +02:00
Laurent Destailleur
86e4207145 Merge branch '6.0' into 6.0-p3 2017-08-04 15:21:41 +02:00
Laurent Destailleur
56426ad3d9 Merge pull request #7228 from aspangaro/6.0-d2 
Fix v6: SQL error in payment list and remove function length_accountg in bank index
 2017-08-04 15:18:43 +02:00
Laurent Destailleur
4cb2a0bce2 Update list.php 2017-08-04 15:17:30 +02:00
Laurent Destailleur
156915a502 Merge pull request #7223 from atm-florian/5.0_fix_missingHook 
FIX add missing hook into product price card
 2017-08-04 15:13:09 +02:00
Laurent Destailleur
8a71b9e95e Avoid creation of dir that is not indexed 2017-08-04 13:51:25 +02:00
Laurent Destailleur
da831d2c8e FIX Bad link in ECM 2017-08-04 13:45:57 +02:00
Laurent Destailleur
3a098ca047 Reduce verbosity 2017-08-04 11:50:30 +02:00
John
bc8b02a990 Merge branch '6.0' of github.com:Dolibarr/dolibarr into FIX_contract_edit_btn_if_no_service 2017-08-04 09:05:13 +02:00
Laurent Destailleur
d1398887e6 Missing picto 2017-08-03 12:02:42 +02:00
Laurent Destailleur
ddd60d1cd2 Fix error counting in cron 2017-08-03 11:23:23 +02:00
Laurent Destailleur
68b19462c3 Fix list of cron jobs 2017-08-03 11:02:07 +02:00
Laurent Destailleur
a8e2f95c39 Better help 2017-08-03 10:47:35 +02:00
Laurent Destailleur
c38d59a4b6 Fix regression 2017-08-02 22:26:01 +02:00
Laurent Destailleur
47ac770d93 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	htdocs/expedition/card.php
	htdocs/expedition/list.php
 2017-08-02 17:51:19 +02:00
Laurent Destailleur
52d39d9d5a Code comment 2017-08-02 17:45:35 +02:00
Laurent Destailleur
cc78a666a0 Fix missing status billed when WORKFLOW_BILL_ON_SHIPMENT is on 2017-08-02 17:15:51 +02:00
Laurent Destailleur
32eb2aba43 Sync transifex 2017-08-02 15:30:46 +02:00
Laurent Destailleur
c8b79214cd Fix translation 2017-08-02 14:53:42 +02:00
Laurent Destailleur
025ecd4ecc Fix default value for inventory code during a stock correction 2017-08-02 14:21:20 +02:00
Laurent Destailleur
2a92ee6008 Fix look and feel v6 2017-08-02 14:10:43 +02:00
John
56e6794151 Fix contract reopen btn if no contract line 2017-08-02 14:10:26 +02:00
Laurent Destailleur
01e1457a09 Fix typo 2017-08-02 13:46:56 +02:00
Laurent Destailleur
5b1f5b0f20 Fix translation done twice into field title of array 2017-08-02 13:31:53 +02:00
John
f130a29739 Fix ref search 2017-08-02 12:14:36 +02:00
Laurent Destailleur
33d6903d3f Fix bad recipient when using mass actions 2017-08-02 11:39:11 +02:00
Ferran Marcet
09c271b7c5 Fix: Correction in the calculation of the next week 2017-08-02 10:31:16 +02:00
Laurent Destailleur
71d49f1c6f Fix pb in ecm 2017-08-01 18:44:34 +02:00
Laurent Destailleur
f9dc628f0b Add tool to fix missing thumbs 2017-08-01 15:53:22 +02:00
Laurent Destailleur
19ba90f577 Fix creation of leave request 2017-08-01 13:17:27 +02:00
Laurent Destailleur
03b3f54c2c Fix class not found 2017-08-01 13:10:15 +02:00
Marc de Lima Lucio
adbb41799c FIX: calculate correct remain to pay for planned bank transactions 2017-08-01 11:08:58 +02:00
Laurent Destailleur
ddee802324 Add second parameter in GETPOST 2017-08-01 10:22:09 +02:00
Alexandre SPANGARO
e41543c22e Fix v6: Debug various_payment 2017-08-01 06:44:37 +02:00
Alexandre SPANGARO
3c34add0d6 remove condition 2017-08-01 06:26:35 +02:00
Alexandre SPANGARO
9629a50853 Fix: SQL error in payment list 2017-08-01 06:21:19 +02:00
Alexandre SPANGARO
efd24cc1a2 Fix: function length_accountg has been moved in getNomUrl 2017-08-01 06:16:23 +02:00
Laurent Destailleur
ae444b5781 Fix travis error 2017-08-01 01:28:07 +02:00
Laurent Destailleur
7d6d4adcdb Fix combo for multicompany not visible where there is other hooks by 
other modules
 2017-07-31 18:16:41 +02:00
Laurent Destailleur
9cf6c43f8a Fix code comment 2017-07-31 15:51:08 +02:00
Laurent Destailleur
7ba5cf5958 Debug view of services lines 2017-07-31 13:48:00 +02:00
Laurent Destailleur
97e694f4d9 Fix look and feel v6 2017-07-31 12:43:07 +02:00
Laurent Destailleur
2f9f9ac80d Fix personal conf was not loaded 2017-07-31 11:56:20 +02:00
florian HENRY
53add04a2e fix :add missing hook into product price card 2017-07-31 10:28:24 +02:00
Laurent Destailleur
ecb4eebfac Fix filter of project in timespent view 2017-07-31 06:58:55 +02:00
Laurent Destailleur
13cbd597ad Fix filter lost 2017-07-31 06:20:32 +02:00
Laurent Destailleur
612ab65b72 Fix by adding a MULTICOMPANY_BACKWARD_COMPATIBILITY option. 2017-07-31 06:01:05 +02:00
Laurent Destailleur
2f68d446ef Fix on filter on project list 2017-07-31 04:52:27 +02:00
Laurent Destailleur
800aa4d5b6 Fix bad target 2017-07-31 04:49:54 +02:00
Laurent Destailleur
52875c08ff Fix missing translation keys 2017-07-31 04:24:13 +02:00
Laurent Destailleur
cfebbe3cc4 Fix css 2017-07-31 03:16:28 +02:00
Laurent Destailleur
7a69df08c5 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	htdocs/cron/class/cronjob.class.php
 2017-07-31 02:39:42 +02:00
Laurent Destailleur
651bf525b0 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 
Conflicts:
	htdocs/cron/class/cronjob.class.php
 2017-07-31 02:37:28 +02:00
Laurent Destailleur
067e5d81d9 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2017-07-31 02:36:23 +02:00
Laurent Destailleur
4f0b35874d Merge pull request #7216 from atm-florian/fix_7213 
FIX : #7213
 2017-07-31 02:29:36 +02:00
Laurent Destailleur
b0adc9cca4 Merge pull request #7207 from atm-quentin/FIX_next_situation_load_extrafields 
FIX next situation keep extrafields
 2017-07-31 02:24:46 +02:00
Laurent Destailleur
d8121c133e Merge pull request #7205 from atm-quentin/6.0 
FIX invoice situation division by zero
 2017-07-31 02:23:37 +02:00
Laurent Destailleur
beaa5279ac Merge pull request #7197 from hregis/6.0_cron 
Fix: add possibility to force entity id
 2017-07-31 02:22:54 +02:00
Laurent Destailleur
cd6a3afc77 Merge pull request #7191 from hregis/4.0_bug3 
Fix: run_jobs return always an error !!
 2017-07-31 02:21:37 +02:00
Laurent Destailleur
eb27f8cfe8 Fix css 2017-07-31 02:18:33 +02:00
Laurent Destailleur
1897e3cbad Some fix for better compatibility 2017-07-30 20:43:18 +02:00
Laurent Destailleur
bb8d458468 Fix menu editor 2017-07-30 19:41:45 +02:00
Laurent Destailleur
837afa0e65 Fix better way to get info for contact/thirdparty on agenda 2017-07-29 04:07:46 +02:00
Laurent Destailleur
2a36166839 Fix error method on non object 2017-07-29 02:11:45 +02:00
Laurent Destailleur
cae21d3937 Fix in agenda output per user/type (reduce memory usage) 2017-07-29 01:59:26 +02:00
Laurent Destailleur
8b82fc3c70 Fix project edition on loan menu 
Fix translation on profit view of projects.
 2017-07-29 00:28:41 +02:00
Laurent Destailleur
af63dc76c1 Fix flex problems 2017-07-28 23:46:11 +02:00
Laurent Destailleur
5e17c2efb9 Fix into filters of time consumed 2017-07-28 23:32:55 +02:00
Laurent Destailleur
25c5ed8f72 Fix for compatibility 2017-07-28 18:09:38 +02:00
Laurent Destailleur
ef3c002144 Module website not stable enough 2017-07-28 12:37:52 +02:00
Laurent Destailleur
55a2e63c32 Revert "Fix include fails" 
This reverts commit bfb904557f.
 2017-07-28 12:07:05 +02:00
Laurent Destailleur
bfb904557f Fix include fails 2017-07-28 12:06:12 +02:00
Laurent Destailleur
f9442c1092 Fix box activity 2017-07-28 11:11:20 +02:00
Laurent Destailleur
60493d0a47 Several fixes (permission, missing method or class) in REST APIs 2017-07-28 11:03:30 +02:00
florian HENRY
f5718106a6 FIX : 7213 2017-07-28 09:45:23 +02:00
Laurent Destailleur
bdfb0b7561 FIX pgsql compatibility. Add PHPUnit to avoid using dates without quotes 2017-07-26 21:22:53 +02:00
Laurent Destailleur
7e0a165131 Fix some pb in search using phone 2017-07-26 20:33:25 +02:00
Laurent Destailleur
c6480af217 Enhance the repair script 2017-07-26 18:47:35 +02:00
Laurent Destailleur
7b34859bc8 Fix collation 2017-07-26 16:14:18 +02:00
atm-quentin
09a1118036 FIX extrafields for invoice too 2017-07-26 15:55:50 +02:00
atm-quentin
29a4900d0b FIX_next_situation_keep_extrafields 2017-07-26 15:20:31 +02:00
atm-quentin
8451ba1f14 FIX invoice situation division by zero 2017-07-26 14:43:10 +02:00
Laurent Destailleur
f3ceedfe38 FIX syntax error with pgsql and frequency lost during cron update. 2017-07-26 12:09:15 +02:00
Laurent Destailleur
04b6c30b6d Code comment 2017-07-26 10:12:22 +02:00
Regis Houssin
b932ce6246 Update cronjob.class.php 
is better condition for use true or 0

if ($result === false || (! is_bool($result) && $result != 0))
 2017-07-26 01:25:15 +02:00
Laurent Destailleur
ab72fbffc6 Fix pb with .svg files 2017-07-25 23:02:14 +02:00
Laurent Destailleur
abb346651e Close #6807 2017-07-25 21:27:07 +02:00
Laurent Destailleur
c386a02889 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	htdocs/langs/en_US/stocks.lang
 2017-07-25 21:10:08 +02:00
Laurent Destailleur
8b793a261f Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 
Conflicts:
	htdocs/core/modules/DolibarrModules.class.php
 2017-07-25 21:08:31 +02:00
Laurent Destailleur
d81fcd5f66 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0 2017-07-25 21:05:35 +02:00
Laurent Destailleur
b7c4f1f086 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 
Conflicts:
	htdocs/compta/facture.php
 2017-07-25 21:05:15 +02:00
Laurent Destailleur
6902960d07 Fix sign of amount debit/credit/montant 2017-07-25 21:03:30 +02:00
Regis Houssin
a52adcad4a Fix: change the condition 2017-07-25 13:52:10 +02:00
Laurent Destailleur
eaab34ee6c Fix permission 2017-07-25 13:36:57 +02:00
Laurent Destailleur
6a3add6e57 Merge pull request #7196 from hregis/6.0_bug 
Fix: translation error
 2017-07-25 13:33:18 +02:00
florian HENRY
d6d454edc8 fix : Various misspelling class (eclipse Oxygen standard PHP control) 2017-07-25 13:32:27 +02:00
Laurent Destailleur
0d5cd5d970 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2017-07-25 13:31:54 +02:00
Laurent Destailleur
a7c96416ba Merge pull request #7194 from hregis/6.0_bug2 
Fix: getEntity $shared param value is now 1 by default
 2017-07-25 13:29:42 +02:00
Laurent Destailleur
cfe445ab14 Code comment 2017-07-25 13:28:56 +02:00
Laurent Destailleur
91d274b51e Merge pull request #7187 from hguibourgdev/patch-11 
New : Prepare toolkit for alert warning
 2017-07-25 13:19:00 +02:00
Laurent Destailleur
cba898e2b9 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	htdocs/compta/facture.php
 2017-07-25 10:12:28 +02:00
Laurent Destailleur
fdcc067c23 Fix regression. Restore lost link "Other invoices". 2017-07-25 10:02:56 +02:00
Laurent Destailleur
9043249740 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	htdocs/commande/list.php
	htdocs/contrat/list.php
	htdocs/contrat/services.php
	htdocs/fourn/facture/list.php
 2017-07-25 09:54:17 +02:00
Laurent Destailleur
aa9b4ce1f3 Fix too long combo for tags 2017-07-25 09:49:08 +02:00
Laurent Destailleur
aff61fad7d Fix new generic classes system 2017-07-25 01:21:20 +02:00
Laurent Destailleur
307b8ef4f6 Debug modulebuilder 2017-07-25 00:32:06 +02:00
Laurent Destailleur
e571616d52 Debug modulebuilder 2017-07-25 00:21:01 +02:00
Laurent Destailleur
b50236da4c Fix dir created at install 2017-07-25 00:07:17 +02:00
Laurent Destailleur
4ae60284fb Debug modulebuilder 2017-07-25 00:03:29 +02:00
Laurent Destailleur
8303cee676 Debug modulebuilder 2017-07-24 21:03:35 +02:00
Regis Houssin
566bc555eb Fix: add possibility to force entity id 2017-07-24 15:41:22 +02:00
Laurent Destailleur
dcb79e66cc Debug modulebuilder 2017-07-24 13:55:12 +02:00
Regis Houssin
88968aae22 Fix: translation error 2017-07-24 09:10:59 +02:00
Regis Houssin
48800bc268 Fix: getEntity $shared param value is now 1 by default 2017-07-24 08:52:10 +02:00
Laurent Destailleur
9043cf759b Fix clone function 2017-07-23 20:27:30 +02:00
Laurent Destailleur
25b107defb Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	htdocs/contrat/list.php
	htdocs/fichinter/list.php
 2017-07-23 19:09:00 +02:00