Laurent Destailleur
52bcef38fc
Merge pull request #10672 from frederic34/patch-1
...
Update html.formfile.class.php
2019-02-24 20:39:32 +01:00
Laurent Destailleur
3fa2680859
Merge pull request #10669 from frederic34/html5fix
...
replace by html5 in ticket supplier_proposal, stripe, societe
2019-02-24 20:36:24 +01:00
Laurent Destailleur
2b6fac3d54
Merge pull request #10664 from frederic34/patch-21
...
Update ajax.lib.php
2019-02-24 20:33:38 +01:00
Frédéric FRANCE
894123fb06
PSR2.Methods.FunctionCallSignature.SpaceBeforeOpenBracket
2019-02-24 20:06:55 +01:00
ptibogxiv
efd27ec1d8
Fix declare functions2.lib.php for donations API
2019-02-24 16:11:52 +01:00
Frédéric FRANCE
167a857f4c
replace html code by html5 in contact
2019-02-24 14:47:47 +01:00
Frédéric FRANCE
e7706192b5
doc comment
2019-02-24 10:08:42 +01:00
Frédéric FRANCE
b51432790f
Update printgcp.modules.php
2019-02-24 09:39:48 +01:00
Frédéric FRANCE
485431a722
Update printgcp.modules.php
2019-02-24 09:31:19 +01:00
Frédéric FRANCE
03714e4bed
Update extrafields.class.php
2019-02-24 09:17:45 +01:00
Frédéric FRANCE
042c6cc56e
Update html.formfile.class.php
2019-02-24 08:50:35 +01:00
Frédéric FRANCE
51b29f2ed5
replace html code by html5 in tpl
2019-02-23 22:43:53 +01:00
Frédéric FRANCE
c7df326a91
replace html code by html5
2019-02-23 22:31:57 +01:00
Frédéric FRANCE
cdf5348b47
Update ajax.lib.php
2019-02-23 18:15:56 +01:00
Frédéric FRANCE
9dd58cf9ce
Update html.formfile.class.php
2019-02-23 16:52:26 +01:00
Laurent Destailleur
4da1bef6dc
Merge pull request #10654 from ptibogxiv/patch-125
...
FIX Stripe live Oauth
2019-02-23 14:21:25 +01:00
Laurent Destailleur
114cd5fa30
Merge pull request #10646 from grandoc/new_branch_21_02_2019
...
fix : When comparing two booleans, it is generally considered safer t…
2019-02-23 14:19:22 +01:00
Laurent Destailleur
bdc4cc0def
Merge pull request #10659 from frederic34/patch-21
...
variables does not seem to be defined for all execution paths
2019-02-23 14:15:32 +01:00
Laurent Destailleur
50da34e26b
Merge pull request #10660 from frederic34/patch-22
...
Update html.formmail.class.php
2019-02-23 14:09:54 +01:00
Laurent Destailleur
fa45d2c5a9
Merge pull request #10657 from frederic34/patch-17
...
doc comment html.formfile.class.php
2019-02-23 14:09:42 +01:00
Laurent Destailleur
0a83bc474c
Merge pull request #10635 from grandoc/new_branch_19_02_2019
...
update with html5 compliant code
2019-02-23 14:09:17 +01:00
Frédéric FRANCE
b75519fefe
Update html.formmail.class.php
2019-02-23 11:25:49 +01:00
Frédéric FRANCE
c3d1ed73d2
variables does not seem to be defined for all execution paths
2019-02-23 11:17:07 +01:00
Frédéric FRANCE
f7c0044e60
doc comment
2019-02-23 09:33:21 +01:00
ptibogxiv
dd160a6242
Create stripelive_oauthcallback.php
2019-02-22 14:56:39 +01:00
Laurent Destailleur
5a18588bb7
CSS
2019-02-21 22:27:56 +01:00
Laurent Destailleur
2891758c23
FIX Stock visibility for service when option stock on service is on
...
NEW Add option STOCK_SHOW_VIRTUAL_STOCK_IN_PRODUCTS_COMBO
2019-02-21 20:13:03 +01:00
Philippe GRAND
54da44b506
Translation
2019-02-21 19:50:03 +01:00
Philippe GRAND
5a88930062
fix : The property total_vat does not exist on Reception
2019-02-21 14:38:12 +01:00
Lionel VESSILLER
cdc2c5ae77
Company Lib : Fix contact events with no thirdparty
2019-02-21 09:49:46 +01:00
Cristian Torres
31aa3ec376
[FIX] ORDER BY before custom filters for where
...
When filtering data "and cac.libelle" would be appended after ORDER BY
2019-02-20 11:45:07 -06:00
Lionel VESSILLER
d10c5cab34
Company Lib : Fix url for emailing type event (link to emailing card)
2019-02-20 15:14:50 +01:00
Laurent Destailleur
a3a89b755f
NEW Gain space by moving the meteo on title line
2019-02-20 06:01:13 +01:00
Laurent Destailleur
c204b8bf7b
Fix menu level
2019-02-20 05:17:24 +01:00
Laurent Destailleur
4296f959ca
Invert option MAIN_HIDE_VERSION into ! MAIN_SHOW_VERSION
...
Reorganize levels of menu accountancy
2019-02-20 04:55:35 +01:00
Laurent Destailleur
abfd610bbc
Fix quote not closed
2019-02-20 03:44:08 +01:00
Philippe GRAND
d83b77432d
update with html5 compliant code
2019-02-19 17:42:12 +01:00
Philippe GRAND
047ec90d78
update with html5 compliant code
2019-02-19 17:38:14 +01:00
Laurent Destailleur
c26dad446f
Merge pull request #10627 from AXeL-dev/patch-7
...
FIX: missing submenus in auguria menu manager
2019-02-19 13:30:20 +01:00
Laurent Destailleur
a3521474f1
Merge pull request #10621 from frederic34/html5fix
...
fix html5 in variant, user
2019-02-19 13:22:46 +01:00
Laurent Destailleur
f0f45858f5
Merge pull request #10629 from hregis/develop_mc
...
FIX wrong class name "CUnits instead CMeasuringUnits"
2019-02-19 13:19:01 +01:00
Regis Houssin
1c3541295b
FIX wrong class name "CUnits instead CMeasuringUnits"
2019-02-19 09:24:30 +01:00
bomuux
c22be202d9
SQL error in box_project.php
...
Corrected a bug : for an internal user with no rights to see all projects, the project box on home cause an error in log.
Finally a lot of simplification because Project::getProjectsAuthorizedForUser do most of the filtering.
2019-02-18 23:17:03 +01:00
Laurent Destailleur
163db3d132
Code comment
2019-02-18 19:41:23 +01:00
Laurent Destailleur
ebfb6beee3
Merge
2019-02-18 19:14:42 +01:00
Laurent Destailleur
e4698fb6a5
Merge
2019-02-18 19:14:25 +01:00
AXeL-dev
b9749ae81c
add missing submenus for supplier orders list in auguria menu
2019-02-18 18:46:38 +01:00
Laurent Destailleur
ad7b8371da
FIX Mark credit note as available for credit note in other currency
...
Conflicts:
htdocs/compta/paiement.php
htdocs/core/class/discount.class.php
2019-02-18 18:30:15 +01:00
Laurent Destailleur
07d1559802
FIX Mark credit note as available for credit note in other currency
2019-02-18 18:27:06 +01:00
Alexandre SPANGARO
49a975beb3
Update works
2019-02-18 07:14:21 +01:00
Frédéric FRANCE
b017213131
selectMulticurrency avoid malformed empty value
2019-02-17 20:59:39 +01:00
Frédéric FRANCE
0255336549
fix html5 user
2019-02-16 10:29:15 +01:00
Laurent Destailleur
e644de4a70
Fix for font awesome 5
2019-02-15 15:30:21 +01:00
Laurent Destailleur
c282ba76ef
Merge pull request #10613 from frederic34/patch-23
...
Update interface_50_modMailmanspip_Mailmanspipsynchro.class.php
2019-02-15 15:19:04 +01:00
Laurent Destailleur
c480f4be68
FIX Bad remote ip address when user is using a proxy
2019-02-15 15:17:24 +01:00
Frédéric FRANCE
8b9bf64643
Update interface_50_modMailmanspip_Mailmanspipsynchro.class.php
2019-02-14 20:44:07 +01:00
Laurent Destailleur
a7af1b1765
Remove deprecated code
2019-02-14 16:29:13 +01:00
Laurent Destailleur
e6e18ff616
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/menus/edit.php
htdocs/product/stock/card.php
htdocs/product/stock/info.php
htdocs/product/stock/movement_list.php
2019-02-14 15:33:17 +01:00
Laurent Destailleur
89050da856
Merge
2019-02-14 15:27:31 +01:00
Laurent Destailleur
d2ee00d4bb
Update security.lib.php
...
Avoid regression on test of restrictArea
2019-02-14 15:21:01 +01:00
Laurent Destailleur
42f754cbc0
Merge pull request #10596 from frederic34/patch-33
...
Update functionsnumtoword.lib.php
2019-02-14 13:33:03 +01:00
Laurent Destailleur
afc612c2cb
Merge pull request #10592 from frederic34/patch-30
...
Update mod_expensereport_sand.php
2019-02-14 13:32:00 +01:00
Laurent Destailleur
418bab3214
Merge pull request #10591 from frederic34/patch-29
...
Update mod_payment_ant.php
2019-02-14 13:31:51 +01:00
Laurent Destailleur
a655481adb
Merge pull request #10590 from frederic34/patch-28
...
Update mod_ticket_universal.php
2019-02-14 13:31:33 +01:00
Laurent Destailleur
cd9bd26267
Merge pull request #10589 from frederic34/patch-27
...
Update mod_facture_mercure.php
2019-02-14 13:31:15 +01:00
Laurent Destailleur
b69a416960
Merge pull request #10588 from frederic34/patch-24
...
Update mod_commande_fournisseur_orchidee.php
2019-02-14 13:29:15 +01:00
Laurent Destailleur
7e4a4c2ae6
Merge pull request #10587 from frederic34/patch-23
...
Update mod_holiday_immaculate.php
2019-02-14 13:28:56 +01:00
Laurent Destailleur
c45ed24342
Merge pull request #10586 from frederic34/patch-22
...
Update modules_holiday.php
2019-02-14 13:28:30 +01:00
Laurent Destailleur
67c8ab47ea
Merge branch 'develop' into patch-21
2019-02-14 13:27:46 +01:00
Laurent Destailleur
6b00bb1a6f
Merge pull request #10583 from frederic34/patch-18
...
Update company.lib.php
2019-02-14 13:26:21 +01:00
Laurent Destailleur
518d42e309
Merge pull request #10572 from aspangaro/10.0_subledger
...
NEW: Add employee/user to subledger account list
2019-02-14 13:24:59 +01:00
Laurent Destailleur
943f975806
Merge pull request #10580 from frederic34/patch-2
...
update doc in barcode.lib.php
2019-02-14 13:23:28 +01:00
Laurent Destailleur
c59313a3cb
Merge pull request #10574 from aspangaro/10.0_menu
...
FIX: Accountancy journal label menu on Auguria
2019-02-14 13:22:49 +01:00
Laurent Destailleur
3050366372
Fix table of units already exists. Merge duplicate c_measuring_units
...
with c_units.
2019-02-14 13:02:44 +01:00
Regis Houssin
359318392f
FIX missing entity filter in function "build_filterField()" (export)
2019-02-14 10:47:07 +01:00
Regis Houssin
aa4c5ae839
FIX missing access security checking with multicompany
2019-02-14 10:12:15 +01:00
Frédéric FRANCE
0594061ef4
Update functionsnumtoword.lib.php
2019-02-14 00:03:10 +01:00
Frédéric FRANCE
6276845956
Update mod_expensereport_sand.php
2019-02-13 23:48:44 +01:00
Frédéric FRANCE
1e52ef19a5
Update mod_payment_ant.php
2019-02-13 23:45:28 +01:00
Frédéric FRANCE
423a69ffad
Update mod_ticket_universal.php
2019-02-13 23:44:06 +01:00
Frédéric FRANCE
210fb2eac1
Update mod_facture_mercure.php
2019-02-13 23:41:47 +01:00
Frédéric FRANCE
5c50ea8afe
Update mod_commande_fournisseur_orchidee.php
...
The property db does not exist on mod_commande_fournisseur_orchidee
2019-02-13 23:39:02 +01:00
Frédéric FRANCE
9370c8b3f6
Update mod_holiday_immaculate.php
2019-02-13 23:36:16 +01:00
Frédéric FRANCE
e0843e6130
Update modules_holiday.php
2019-02-13 23:35:44 +01:00
Laurent Destailleur
a689f8dc3f
Code comment
2019-02-13 23:34:28 +01:00
Frédéric FRANCE
b18927a6c1
Update cunits.class.php
2019-02-13 23:13:48 +01:00
Frédéric FRANCE
154ba78ee7
Update company.lib.php
2019-02-13 22:43:12 +01:00
Frédéric FRANCE
b9d37c276d
update doc in barcode.lib.php
2019-02-13 22:23:14 +01:00
Laurent Destailleur
2311912d8a
Merge branch 'develop' into dev_importproduct_measuringunit
2019-02-13 16:35:46 +01:00
Laurent Destailleur
f60940a141
Merge pull request #10560 from Toumaniere/9.0
...
Fix #10551 : MailmanSpip & Adherent : add and remove mailman list
2019-02-13 16:31:32 +01:00
Laurent Destailleur
69313cbf0d
Merge pull request #10567 from frederic34/patch-18
...
Update images.lib.php
2019-02-13 16:25:32 +01:00
Laurent Destailleur
903ba57e09
Merge pull request #10565 from frederic34/patch-2
...
fix doc in tax.lib.php
2019-02-13 16:25:12 +01:00
Laurent Destailleur
534eac1a54
Merge pull request #10566 from frederic34/patch-17
...
Update rssparser.class.php
2019-02-13 16:24:45 +01:00
Timoté Fallais
9a28c12781
reform MEMBER_VALIDATE and MEMBER_MODIFY code correctly
2019-02-13 14:57:37 +01:00
Timoté Fallais
a115b1da7f
Fix MailmanSpip bad adherent type after update
2019-02-13 14:45:51 +01:00
Alexandre SPANGARO
849299cdb6
FIX: Accountancy journal label menu on Auguria
2019-02-13 11:52:31 +01:00
Laurent Destailleur
ced386fdca
Fix phpcs
2019-02-13 11:32:00 +01:00
florian HENRY
de87321c15
fix travcis
2019-02-13 10:28:08 +01:00
Alexandre SPANGARO
4c8ee6950b
NEW: Add employee/user to subledger account list
...
With ACCOUNTANCY_COMBO_FOR_AUX
2019-02-13 09:41:44 +01:00
florian HENRY
e2d13c0e1f
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
dev_importproduct_measuringunit
Conflicts:
htdocs/contact/consumption.php
htdocs/webservices/server_productorservice.php
2019-02-13 09:23:52 +01:00
florian HENRY
5c059c897d
fix travis (mosty for dev no conerne by my changes)
2019-02-13 09:21:14 +01:00
florian HENRY
d88475c61a
Merge branch 'develop' of local repository into dev_importproduct_measuringunit
2019-02-13 08:59:18 +01:00
Frédéric FRANCE
e4b73e8273
Update images.lib.php
2019-02-12 23:39:59 +01:00
Frédéric FRANCE
fa31f95356
Update rssparser.class.php
2019-02-12 23:31:21 +01:00
Frédéric FRANCE
2aae952760
fix doc in tax.lib.php
2019-02-12 23:25:26 +01:00
Laurent Destailleur
5fceee3048
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/install/mysql/migration/8.0.0-9.0.0.sql
2019-02-12 19:02:19 +01:00
Laurent Destailleur
affbd20cdb
FIX Bad link in menu manager
2019-02-12 18:56:32 +01:00
Timoté Fallais
6c08cc6b6a
MailmanSpip & Adherent : add and remove mailman list
2019-02-12 17:45:26 +01:00
florian HENRY
eba4be2335
ad missing files
2019-02-12 17:03:47 +01:00
Laurent Destailleur
d134e18db6
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-02-12 17:02:37 +01:00
Laurent Destailleur
0d8447ad39
Merge branch 'develop' of https://github.com/wdammak/dolibarr into
...
wdammak-develop
# Conflicts:
# htdocs/core/modules/stock/doc/pdf_stdmovement.modules.php
2019-02-12 16:58:55 +01:00
florian HENRY
5b5f96bafb
NEW : measuring unit dictionnary and product size/unit import
2019-02-12 16:58:11 +01:00
Alexandre SPANGARO
b99149b940
Move error on function dol_include_once() to LOG_WARNING
2019-02-12 16:34:52 +01:00
Laurent Destailleur
205152501e
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
.travis.yml
htdocs/public/payment/newpayment.php
2019-02-12 13:39:39 +01:00
Laurent Destailleur
e054b080a5
Merge branch 'develop' into GenericFunctionsFunctionCallArgumentSpacing
2019-02-12 13:33:39 +01:00
Laurent Destailleur
e8fc72ecf4
Merge pull request #10538 from frederic34/html5boxes
...
replace html align by class in boxes
2019-02-12 13:32:42 +01:00
Laurent Destailleur
b1088f556f
Merge pull request #10536 from grandoc/new_branch_09_02_2019
...
language internationalization
2019-02-12 13:28:56 +01:00
Laurent Destailleur
1c3520d040
Merge pull request #10552 from ATM-Nicolas/fix_default_fontawesome_signout_icon
...
FIX : Default sign out icon if not using Font Awesome 5
2019-02-12 13:12:58 +01:00
Laurent Destailleur
f42d07d6da
Merge pull request #10529 from frederic34/patch-2
...
desactivate button on click to avoid multiple clicks
2019-02-12 13:12:30 +01:00
ATM-Nicolas
4e35ebe52a
FIX : Default sign out icon if not using Font Awesome 5
2019-02-12 10:43:00 +01:00
Laurent Destailleur
a62bccaf24
Fix phpcs
2019-02-11 19:19:05 +01:00
Laurent Destailleur
f0e56abac7
NEW Module ticket is available as a stable module
2019-02-11 19:16:37 +01:00
Laurent Destailleur
27cad29e1e
Fix regression of right alignement
2019-02-11 15:06:52 +01:00
Laurent Destailleur
c095f802dd
Dolibarrize module ticket
2019-02-11 14:51:59 +01:00
Laurent Destailleur
0bd30b160a
Fix picto logout with fontawesome 5
2019-02-11 11:55:48 +01:00
Frédéric FRANCE
152d8ffcbf
Merge remote-tracking branch 'upstream/develop' into GenericFunctionsFunctionCallArgumentSpacing
2019-02-10 11:08:59 +01:00
Frédéric FRANCE
1e43f8e54a
PEAR FunctionCallSignature
2019-02-10 10:45:49 +01:00
Frédéric FRANCE
529354718b
replace html align by class in boxes
2019-02-09 15:24:21 +01:00
Laurent Destailleur
2d4ccec309
Fix document generation of modulebuilder
2019-02-09 14:12:36 +01:00
Laurent Destailleur
522afd8e7b
Fix font awesome 5
2019-02-09 13:11:02 +01:00
Frédéric FRANCE
580e5c42d2
GenericFunctionsFunctionCallArgumentSpacing
2019-02-09 12:00:49 +01:00
Philippe Grand
92ec149fb6
Update modules_fichinter.php
2019-02-09 11:05:52 +01:00
Philippe GRAND
869f59de96
language internationalization
2019-02-09 10:56:59 +01:00
Laurent Destailleur
5483856543
Fix phpcs
2019-02-08 23:53:40 +01:00
Laurent Destailleur
7625eb7cd4
Fix missing error management after afterPDFCreation hook.
...
Removed dead code
2019-02-08 19:54:24 +01:00
Laurent Destailleur
e2934a6b5f
Error message returned by old non "addreplace" hooks is propagated too
2019-02-08 19:38:52 +01:00
Laurent Destailleur
a916708068
Fix missing disable dependency
2019-02-08 19:01:47 +01:00
Laurent Destailleur
ed733fb82d
Fix phpcs
2019-02-08 13:28:10 +01:00
Laurent Destailleur
8760b1e592
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-02-08 12:57:50 +01:00
Laurent Destailleur
27da574e38
Fix phpcs
2019-02-08 12:36:33 +01:00
Laurent Destailleur
1611c613f5
Fix phpcs
2019-02-08 12:19:51 +01:00
Laurent Destailleur
ec686a8f79
Fix phpcs
2019-02-08 11:30:20 +01:00
Laurent Destailleur
38d4284638
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/db/pgsql.class.php
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
htdocs/filefunc.inc.php
htdocs/imports/import.php
htdocs/supplier_proposal/card.php
2019-02-08 11:26:08 +01:00
Frédéric FRANCE
f548a0ed79
desactivate button on click to avoid multiple clicks
2019-02-08 11:01:47 +01:00
Laurent Destailleur
fe1188c4ea
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/filefunc.inc.php
2019-02-08 10:44:45 +01:00
Laurent Destailleur
1c129a78ae
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2019-02-08 10:22:55 +01:00
Laurent Destailleur
679a13e48c
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/expedition/class/expedition.class.php
2019-02-08 10:22:36 +01:00
Laurent Destailleur
3318baa664
Merge pull request #10522 from atm-ph/fix_8.0_crabe_payment_table
...
Fix display payment table on multiple pages
2019-02-08 10:08:46 +01:00
Laurent Destailleur
7334f02e5c
Merge pull request #10514 from atm-florian/dev_defautselectcustomertype
...
Dev defautselectcustomertype
2019-02-08 09:56:29 +01:00
Laurent Destailleur
471f11dace
Merge pull request #10502 from hregis/9.0_merge
...
FIX wrong merged conflict
2019-02-08 09:34:49 +01:00
Laurent Destailleur
af92303319
Merge pull request #10487 from frederic34/psr2squizwhite
...
psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent
2019-02-08 09:30:25 +01:00
Laurent Destailleur
e5d7a862b4
Merge pull request #10527 from atm-ph/fix_8.0_psql_search_insensitive_accent
...
Fix psql search insensitive accent
2019-02-08 09:29:59 +01:00
Laurent Destailleur
3bdf017d41
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-02-07 19:39:59 +01:00
Laurent Destailleur
8d82135033
Fix missing \n
2019-02-07 19:39:23 +01:00
Laurent Destailleur
491bfbdbfc
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-02-07 19:39:04 +01:00
Laurent Destailleur
89af7b0e98
Add doctype to web site
2019-02-07 19:38:36 +01:00
atm-ph
51515a487e
Fix search unaccent from left menu search box
2019-02-07 17:58:25 +01:00
atm-ph
ec7ef265b7
Fix psql search insensitive accent
2019-02-07 17:47:17 +01:00
Laurent Destailleur
6a4a92510d
Code comment
2019-02-07 13:32:05 +01:00
atm-ph
8e6a567b09
Fix display payment table on multiple pages
2019-02-07 12:36:22 +01:00
florian HENRY
6ee5a9e2a6
fix travis
2019-02-07 12:21:33 +01:00
florian HENRY
3f20cae6d3
NEW: setup default thridparty type (customer or prospect/customer)
2019-02-06 10:54:11 +01:00
florian HENRY
95cc9faf7e
fix php warning
2019-02-06 09:01:24 +01:00
Laurent Destailleur
789c089e14
Code comment
2019-02-05 13:08:28 +01:00
Marc de Lima Lucio
428efa9227
FIX: line edit template: keep fk_parent_line
2019-02-05 12:02:49 +01:00
Regis Houssin
8860eab6b1
FIX wrong merged conflict
2019-02-05 07:40:50 +01:00
Frédéric FRANCE
e1e14ae6e6
wip
2019-02-03 22:58:56 +01:00
Frédéric FRANCE
970392adb8
Merge remote-tracking branch 'upstream/develop' into psr2squizwhite
2019-02-03 22:41:57 +01:00
Laurent Destailleur
57f81217ee
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/localtax/index.php
htdocs/compta/tva/index.php
2019-02-03 21:14:44 +01:00
Laurent Destailleur
efe5cd3dd8
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-02-03 21:13:06 +01:00
Laurent Destailleur
410b291ad8
Fix quote not closed
2019-02-03 20:52:39 +01:00
Laurent Destailleur
72f78ecf3b
FIX #10460 compatibility with MariaDB 10.4
2019-02-03 20:02:05 +01:00
Laurent Destailleur
4d41b1b33c
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-02-03 19:45:45 +01:00
Laurent Destailleur
a6dde3d6bd
Merge branch 'develop' into nospaceaftercomma
2019-02-03 19:27:16 +01:00
Laurent Destailleur
9f7dfe2921
Merge pull request #10481 from frederic34/psr2forloop
...
psr2 Squiz.ControlStructures.ForEachLoopDeclaration
2019-02-03 19:11:07 +01:00
Laurent Destailleur
49d695c9b2
Merge pull request #10479 from frederic34/patch-2
...
remove psr2 warning for else if usage
2019-02-03 19:06:38 +01:00
Laurent Destailleur
326996d392
Merge pull request #10488 from frederic34/PSR2EndFileNewlineNoneFound
...
psr2 end file new line none found
2019-02-03 19:04:28 +01:00
Laurent Destailleur
f8b10e9c3d
Doxygen
2019-02-03 18:47:55 +01:00
Laurent Destailleur
e309261140
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-02-03 18:19:58 +01:00
Frédéric FRANCE
273d68381c
psr2 end file new line none found
2019-02-03 15:21:21 +01:00
Frédéric FRANCE
80a12fcd1c
psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent
2019-02-03 14:29:45 +01:00
Frédéric FRANCE
03701fa091
psr2
2019-02-02 18:25:01 +01:00
Frédéric FRANCE
25abceb116
remove psr2 warning for else if usage
2019-02-02 08:59:37 +01:00
Frédéric FRANCE
96de1b175c
clean missing spaces in the last merge
2019-02-02 08:51:30 +01:00
Frédéric FRANCE
bd8d81a96e
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
2019-02-02 07:49:41 +01:00
Laurent Destailleur
75845a990f
FIX Missing province in export of invoice
2019-02-01 22:55:28 +01:00
Laurent Destailleur
ebe30f7a0e
FIX error report not returned
2019-02-01 19:19:23 +01:00
Frédéric FRANCE
f5b2cf75f2
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
2019-02-01 18:31:44 +01:00
Laurent Destailleur
044e617667
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-02-01 18:17:09 +01:00
Laurent Destailleur
9d03f4b228
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-02-01 18:17:02 +01:00
Laurent Destailleur
a2ab6348ed
Fix bad menu leading on a development page
2019-02-01 17:06:34 +01:00
Laurent Destailleur
08050434a1
Merge pull request #10435 from wdammak/patch-22
...
Wrapping for stock movements
2019-02-01 16:11:37 +01:00
Laurent Destailleur
3fc49a9de2
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-02-01 16:07:27 +01:00
Laurent Destailleur
6de732d7f8
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/modules/facture/mod_facture_mars.php
htdocs/core/modules/facture/mod_facture_terre.php
2019-02-01 16:07:18 +01:00
Laurent Destailleur
35f65a571c
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/core/modules/facture/mod_facture_mars.php
htdocs/core/modules/facture/mod_facture_terre.php
htdocs/fourn/commande/list.php
2019-02-01 16:05:43 +01:00
Laurent Destailleur
dee2a373c1
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/fourn/class/fournisseur.commande.class.php
2019-02-01 16:01:18 +01:00
Laurent Destailleur
cf89fbd165
Merge pull request #10474 from ATM-Nicolas/new_contact_related_item_tab
...
New contact related item tab
2019-02-01 15:39:39 +01:00
Laurent Destailleur
eb3621839a
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/members.lang
htdocs/langs/fr_FR/members.lang
2019-02-01 15:14:19 +01:00
Laurent Destailleur
ae81bbac93
Better var name
2019-02-01 13:49:07 +01:00
Laurent Destailleur
b14a16a119
Code comment
2019-02-01 13:48:09 +01:00
Laurent Destailleur
849b3b640b
Code comment
2019-02-01 13:41:23 +01:00
ATM-Nicolas
2cbb58c2eb
Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_contact_related_item_tab
2019-02-01 10:54:42 +01:00
ATM-Nicolas
f432a874e6
NEW : Contact related items tab
2019-02-01 10:51:28 +01:00
Laurent Destailleur
3e6aef472d
css
2019-01-31 20:53:59 +01:00
Laurent Destailleur
a0c0b377b2
css
2019-01-31 20:53:47 +01:00
Laurent Destailleur
189323ad58
Fix when using image into description
2019-01-31 18:12:34 +01:00
Laurent Destailleur
4254ad0d33
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-01-31 15:51:54 +01:00
Laurent Destailleur
14dea53700
FIX Missing field in import/export of users
2019-01-31 15:51:02 +01:00
gauthier
09ba059c21
FIX : need an order by in case we found other invoice with same number but not same date
2019-01-31 11:03:06 +01:00
Frédéric FRANCE
b766204690
wip
2019-01-30 22:53:47 +01:00
Frédéric FRANCE
f83ee43a19
Merge branch 'develop' into nospaceaftercomma
2019-01-30 22:15:22 +01:00
Laurent Destailleur
c1f3f4c2b5
Fix: text for empty line not visible in select
2019-01-30 20:03:04 +01:00
Laurent Destailleur
b197ad72d3
Work on billing projects
2019-01-30 20:02:41 +01:00
Laurent Destailleur
200d30f2b9
Fix: text for empty line not visible in select
2019-01-30 20:01:55 +01:00
Laurent Destailleur
e18bd6f986
Merge branch 'develop' into nospaceaftercomma
2019-01-30 18:27:35 +01:00
Laurent Destailleur
408609e0ec
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/card.php
htdocs/core/tpl/objectline_edit.tpl.php
2019-01-30 16:54:38 +01:00
Laurent Destailleur
1b8a873987
Merge pull request #10434 from frederic34/patch-17
...
The variable $i does not seem to be defined for all execution paths
2019-01-30 16:49:16 +01:00
Laurent Destailleur
9fdba921b4
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/compta/facture/card.php
htdocs/core/lib/functions.lib.php
2019-01-30 16:48:33 +01:00
Laurent Destailleur
81ae4c52c5
Merge pull request #10446 from mapiolca/8.0
...
Fix #10317 et #10318
2019-01-30 16:43:14 +01:00
Laurent Destailleur
97248a830b
FIX #10440
2019-01-30 16:28:37 +01:00
Laurent Destailleur
6d992a6d7b
FIX #10440
2019-01-30 16:24:27 +01:00
Laurent Destailleur
e72d6c50e6
Merge pull request #10428 from frederic34/toomanylines
...
PSR2.Files.EndFileNewline.TooMany
2019-01-30 16:17:09 +01:00
Laurent Destailleur
648eea3a70
Merge branch 'develop' into nospaceaftercomma
2019-01-30 16:00:11 +01:00
Laurent Destailleur
17c3337c9b
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-01-30 15:25:43 +01:00
Laurent Destailleur
c354656b1b
Merge pull request #10449 from ptibogxiv/patch-108
...
NEW : list of stripe's payout
2019-01-30 15:02:27 +01:00
Laurent Destailleur
60fa8d08c2
Merge pull request #10456 from aspangaro/10.0_Ledger_improve_import
...
FIX: FEC Compatibility for import in ledger
2019-01-30 15:01:02 +01:00
Laurent Destailleur
3198f9fbbe
Merge pull request #10441 from aspangaro/10.0_email
...
Move my email to the new one
2019-01-30 14:59:58 +01:00
Laurent Destailleur
6d3529b606
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-01-30 14:47:28 +01:00
Laurent Destailleur
340412ed00
FIX generation of document for supplie rinvoice
2019-01-30 14:07:50 +01:00
Laurent Destailleur
f955f3f4ee
Fix report error only if return code < 0
2019-01-30 12:23:34 +01:00
Alexandre SPANGARO
84ecfd96fb
Update example
2019-01-30 11:22:01 +01:00
gauthier
9490929216
FIX : $conf->fournisseur->commande->enabled doesn't exist, we must use $conf->fournisseur->enabled
2019-01-30 10:49:32 +01:00
gauthier
412940b5ca
FIX : $conf->fournisseur->commande->enabled doesn't exist, we must use $conf->fournisseur->enabled
2019-01-30 10:19:13 +01:00
Alexandre SPANGARO
1b675ba0b6
FIX: FEC Compatibility for import in ledger
2019-01-30 09:51:29 +01:00
wdammak
84d2bcce4f
Update eldy.lib.php
...
Fix Travis
2019-01-29 22:08:18 +01:00
wdammak
f3c725f40f
Update eldy.lib.php
...
fix travis
2019-01-29 21:36:52 +01:00
wdammak
c18a8bef1b
Update eldy.lib.php
...
Simplifying horizontal menu writing, it would simplify menu updates in the future.
The menu table can be further simplified, it's in a 2nd step if @eldy confirms this restructuring.
Already tested and it works.
2019-01-29 19:44:59 +01:00
Laurent Destailleur
cedf1bb269
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/actions_massactions.inc.php
2019-01-29 19:13:57 +01:00
Laurent Destailleur
205b7f2e95
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-01-29 19:04:40 +01:00
Laurent Destailleur
3d218cadb7
FIX last_main_doc var not saved
...
Conflicts:
htdocs/core/class/commonobject.class.php
2019-01-29 19:03:45 +01:00
Laurent Destailleur
9ef93bceca
FIX last_main_doc var not saved
2019-01-29 18:40:47 +01:00
Laurent Destailleur
c6755b3cf1
Fix formatting of number in quantity field
2019-01-29 15:59:41 +01:00
Pierre Ardoin
80cfe86508
Update objectline_view.tpl.php
2019-01-29 14:26:14 +01:00
Pierre Ardoin
5ea1cf0775
Update objectline_edit.tpl.php
2019-01-29 14:25:34 +01:00
ptibogxiv
a3b648824a
ADD payout link
2019-01-29 14:12:35 +01:00
Pierre Ardoin
b6df02e795
Correction oubli date de livraison
...
Corrige l'oubli de la substitution de la date de livraison pour les commandes et demande de prix fournisseurs
2019-01-29 11:47:39 +01:00
Pierre Ardoin
dd0f6b3829
Edition Ligne Travaux Supplémentaires
...
Correction pour permettre l'édition si la ligne n'existe pas dans une précédente situation. Permet l'édition d'une ligne si elle a été ajouté dans la situation actuelle.
2019-01-29 11:30:14 +01:00
Pierre Ardoin
508fb5c9cb
Prise en charge des Travaux supplémentaires
...
Corrige la filtration lors des situations client afin de prendre en compte la possibilité d'ajouter des travaux en cours de chantier.
2019-01-29 11:13:11 +01:00
Laurent Destailleur
08a181bfbf
Fix substitution of REF_CLIENT and REF_SUPPLIER
2019-01-29 11:00:17 +01:00
Laurent Destailleur
43c0a2232c
Fix massaction
2019-01-29 10:51:34 +01:00
