lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
73,492 Commits 43 Branches 150 Tags 886 MiB
63ffb7a873
Commit Graph

64259 Commits

Author SHA1 Message Date
Frédéric FRANCE
95212e9cc1
Update ical.class.php 2019-02-13 00:44:34 +01:00
Frédéric FRANCE
3de192364b
Update ical.class.php 2019-02-13 00:12:20 +01:00
Frédéric FRANCE
26a77b0cbc
Update supplier_proposal.class.php 2019-02-13 00:06:51 +01:00
Frédéric FRANCE
56bbe41917
Update facture-rec.class.php 2019-02-12 23:54:38 +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
Laurent Destailleur
11f48460b2 Fix 2019-02-12 23:26:25 +01:00
Frédéric FRANCE
2aae952760
fix doc in tax.lib.php 2019-02-12 23:25:26 +01:00
Laurent Destailleur
d86017b8ff Fix create left menu entry 2019-02-12 23:21:53 +01:00
Laurent Destailleur
639dfa09aa Fix creation of left menu 2019-02-12 23:17:40 +01:00
Laurent Destailleur
d42bf54436 Fix export zip 2019-02-12 23:12:33 +01:00
Frédéric FRANCE
484acc2e00
fix phpcs 2019-02-12 20:55:55 +01:00
wdammak
32c48f0fa2
Update main.inc.php 
break ;)
 2019-02-12 19:56:55 +01:00
Laurent Destailleur
036dc52170 Fix test 2019-02-12 19:55:54 +01:00
Laurent Destailleur
5a2161ad09 Debug export of zip 2019-02-12 19:47:46 +01:00
Laurent Destailleur
42bb96dc27 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-02-12 19:44:30 +01:00
Laurent Destailleur
6a8504e1f8 Fix missing constant 2019-02-12 19:44:12 +01:00
ptibogxiv
7d5ea4fc35
Update stripe.class.php 2019-02-12 19:42:34 +01:00
Laurent Destailleur
1f9f335e44 FIX creation of menu entry with parent id not int 
Conflicts:
	htdocs/admin/menus/edit.php
 2019-02-12 19:11:05 +01:00
Laurent Destailleur
986fb2ae38 FIX creation of menu entry with parent id not int 2019-02-12 19:09:27 +01:00
ptibogxiv
8f3ffc6520
NEW stripe payment intent 
use it for stripe
 2019-02-12 19:03:45 +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
f1500281ef Fix phpcs 2019-02-12 19:00:50 +01:00
ptibogxiv
85272b8345
NEW support stripe payment prelevement 2019-02-12 18:58:57 +01:00
Laurent Destailleur
affbd20cdb FIX Bad link in menu manager 2019-02-12 18:56:32 +01:00
ptibogxiv
cc1aabfd19
NEW Stripe Payment Intent 
Starting in September 2019, a new regulation called Strong Customer Authentication (SCA) will require businesses in Europe to request additional authentication for online payments. We recommend that all European businesses start building their Stripe integrations with either our PaymentIntents API or our new Checkout to be ready for these rule changes.

https://stripe.com/docs/payments/payment-intents

need replace actual integration
 2019-02-12 18:47:35 +01:00
Laurent Destailleur
666d03f596 Fix multicompany for page to export zip of invoices 2019-02-12 18:15:30 +01:00
florian HENRY
914de5e089 fix mùigration script 2019-02-12 18:08:21 +01:00
Laurent Destailleur
68e6f32320 css 2019-02-12 17:56:03 +01:00
Jimmy L
a172ea00a4 Rest API: Proposal, Orders, Invoices: Add contact details 2019-02-12 17:54:59 +01:00
Timoté Fallais
6c08cc6b6a MailmanSpip & Adherent : add and remove mailman list 2019-02-12 17:45:26 +01:00
Laurent Destailleur
f7d183f3ef Add Kosovo country 2019-02-12 17:43:38 +01:00
Laurent Destailleur
25550959e3 Fix phpcs 2019-02-12 17:05:45 +01:00
florian HENRY
eba4be2335 ad missing files 2019-02-12 17:03:47 +01:00
Laurent Destailleur
0bb59bf6cc Fix phpcs 2019-02-12 17:03:09 +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
Laurent Destailleur
3d3aca804f
Merge pull request #10554 from grandoc/new_branch_12_02_2019 
update with html5 compliant code
 2019-02-12 16:57:11 +01:00
Laurent Destailleur
56e9fa9a22
Merge pull request #10557 from aspangaro/10.0_subledger 
FIX: In various payment, subledger & accout may be alphanumeric
 2019-02-12 16:51:42 +01:00
Laurent Destailleur
afc61d892e
Merge pull request #10558 from aspangaro/10.0_dol_include_once_WARNING 
Move error on function dol_include_once() to LOG_WARNING
 2019-02-12 16:51:03 +01:00
Laurent Destailleur
41863bb127 Merge 2019-02-12 16:42:51 +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
04950a5c91 Trans 2019-02-12 16:29:37 +01:00
Alexandre SPANGARO
7e60c3bf84 FIX: In various payment, subledger & accout may be alphanumeric 2019-02-12 16:27:25 +01:00
Laurent Destailleur
f311d50201 Fix unique key in accounting_account 
Conflicts:
	htdocs/install/mysql/migration/8.0.0-9.0.0.sql
 2019-02-12 15:53:43 +01:00
Laurent Destailleur
26168f0de5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-02-12 15:50:33 +01:00
Laurent Destailleur
a0c1e5ed84 Fix unique key in accounting_account 2019-02-12 15:43:24 +01:00
Philippe GRAND
f7a28328ed update with html5 compliant code 2019-02-12 15:40:16 +01:00
Philippe GRAND
60e503c7d1 update with html5 compliant code 2019-02-12 15:02:54 +01:00
Philippe GRAND
5007ef82c8 update with html5 compliant code 2019-02-12 14:56:38 +01:00
Philippe GRAND
fd6eaf8c3d update with html5 compliant code 2019-02-12 14:53:35 +01:00
Philippe GRAND
66e8380a4a update with html5 compliant code 2019-02-12 14:48:07 +01:00
Philippe GRAND
e10d1eb365 update with html5 compliant code 2019-02-12 14:44:25 +01:00
Philippe GRAND
8a62c9bc5f update with html5 compliant code 2019-02-12 14:40:30 +01:00
Laurent Destailleur
843f7bea8d
Merge pull request #10546 from frederic34/patch-20 
Update index.php
 2019-02-12 13:46:33 +01:00
Laurent Destailleur
17bb5a3c4b
Merge pull request #10545 from frederic34/patch-18 
Update consumption.php
 2019-02-12 13:45:49 +01:00
Laurent Destailleur
aa206e5d7c
Update consumption.php 2019-02-12 13:45:38 +01:00
Laurent Destailleur
46941d4c20
Merge pull request #10539 from frederic34/patch-17 
Update paiement.php
 2019-02-12 13:43:09 +01:00
Laurent Destailleur
74f468dc91
Merge pull request #10535 from atm-quentin/FIX_multiple_sending_form 
FIX on chrome you can send multiple form if you click more than once …
 2019-02-12 13:42:37 +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
00eb95b660 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-02-12 13:36:32 +01:00
Laurent Destailleur
53a8f1cd3b Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-02-12 13:36:05 +01:00
Laurent Destailleur
3e1b75e916
Merge pull request #10541 from grandoc/new_branch_10_02_2019 
update with html5 compliant code
 2019-02-12 13:35:27 +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
7874aa374c
Merge pull request #10534 from OPEN-DSI/fix-margin-agents2 
Fix calcul margin by seller and parameters send (filters)
 2019-02-12 13:31:56 +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
6f6a767255
Merge pull request #10520 from aspangaro/develop 
NEW: Add subledger in various payment
 2019-02-12 13:20:58 +01:00
Laurent Destailleur
04b0216277
Merge pull request #10548 from aspangaro/7.0_accountancy_multicomp_movement 
FIX: Accountancy - Add transaction with multicompany use only the first entity
 2019-02-12 13:19:00 +01:00
Laurent Destailleur
3daa8b0731
Merge pull request #10550 from frederic34/patch-21 
continue is ambiguous in outer loop for php 7.3
 2019-02-12 13:18:34 +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
Laurent Destailleur
d225b1be8b
Merge pull request #10532 from atm-maxime/fix_purchase_journal 
Fix wrong column name in purchase journal
 2019-02-12 13:11:45 +01:00
Laurent Destailleur
9070e5fe01
Merge pull request #10543 from ka7/spelling_1 
spelling fixes
 2019-02-12 13:10:18 +01:00
Laurent Destailleur
9dc2a1f148
Update productaccount.php 2019-02-12 12:51:52 +01:00
Laurent Destailleur
53b2100dbb
Update productaccount.php 2019-02-12 12:50:36 +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
771cd476ee Update ckeditor 2019-02-12 03:57:16 +01:00
Laurent Destailleur
8ca939d2c1 Update tcpdf to 6.2.26 2019-02-12 03:32:22 +01:00
Laurent Destailleur
f69f574eff Upgrade lib escpos-php 2019-02-12 03:28:17 +01:00
Laurent Destailleur
456a76cb11 Fix suffix 2019-02-12 01:11:37 +01:00
Frédéric FRANCE
a16ff4e368
Update OLE.php 2019-02-11 22:29:59 +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
9353cf976d Fix translation 2019-02-11 18:44:43 +01:00
Laurent Destailleur
8014d72dd5 progress before status 2019-02-11 18:12:27 +01:00
Laurent Destailleur
9b8a13cfe6 Dolibarrize module ticket 2019-02-11 15:41:07 +01:00
Laurent Destailleur
5c01ec158d Fix regression 2019-02-11 15:40:33 +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
5eceeef3aa Dolibarrize module ticket 2019-02-11 14:51:45 +01:00
Laurent Destailleur
0bd30b160a Fix picto logout with fontawesome 5 2019-02-11 11:55:48 +01:00
Alexandre SPANGARO
2dc4edb68c FIX: Accountancy - Add transaction with multicompany use all the time 1st entity 2019-02-11 11:36:12 +01:00
Frédéric FRANCE
be9cfdae85
Update index.php 2019-02-11 00:05:38 +01:00
Frédéric FRANCE
9893e8d752
Update consumption.php 2019-02-10 23:37:12 +01:00
Philippe Grand
d589ba4847
Update clientfourn.php 
fixed...
 2019-02-10 19:13:11 +01:00
Frédéric FRANCE
b041eeae22
first parameter of print_liste_field_titre was translated 2019-02-10 18:11:34 +01:00
Frédéric FRANCE
4d6dcf400e
first parameter of print_liste_field_titre was translated 2019-02-10 17:30:34 +01:00
Philippe GRAND
0911631b47 update with html5 compliant code 2019-02-10 16:31:34 +01:00
Philippe GRAND
0d5726b70a update with html5 compliant code 2019-02-10 16:08:03 +01:00
Frédéric FRANCE
ba32c3b782
first parameter of print_liste_field_titre was translated 2019-02-10 16:06:07 +01:00
Philippe GRAND
5d6ebad557 update with html5 compliant code 2019-02-10 16:05:06 +01:00
Philippe GRAND
9670228f06 update with html5 compliant code 2019-02-10 16:00:59 +01:00
Philippe GRAND
d42ef14a92 update with html5 compliant code 2019-02-10 15:59:19 +01:00
Frédéric FRANCE
af3adcecb0
first parameter of print_liste_field_titre was translated 2019-02-10 15:48:53 +01:00
klemens
beb2791dde spelling fixes 2019-02-10 12:59:09 +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
aecac3632f
wip 2019-02-10 11:08:48 +01:00
Philippe GRAND
20c0af1f57 update with html5 compliant code 2019-02-10 11:04:09 +01:00
Philippe GRAND
1b25d284a2 update with html5 compliant code 2019-02-10 11:01:23 +01:00
Philippe GRAND
89351e6027 update with html5 compliant code 2019-02-10 10:56:34 +01:00
Philippe GRAND
e7f2b92eca update with html5 compliant code 2019-02-10 10:49:42 +01:00
Frédéric FRANCE
1e43f8e54a
PEAR FunctionCallSignature 2019-02-10 10:45:49 +01:00
Philippe GRAND
2624865632 update with html5 compliant code 2019-02-10 10:38:50 +01:00
Philippe GRAND
83b95ae6cc update with html5 compliant code 2019-02-10 10:25:20 +01:00
Philippe GRAND
19885cb465 update with html5 compliant code 2019-02-10 10:23:37 +01:00
Philippe GRAND
673e09d7c2 update with html5 compliant code 2019-02-10 10:21:54 +01:00
Philippe GRAND
508d6345a1 update with html5 compliant code 2019-02-10 10:16:58 +01:00
Philippe GRAND
c071e488cf update with html5 compliant code 2019-02-10 10:10:41 +01:00
Laurent Destailleur
7d20321b3b Fix trans 2019-02-09 19:24:52 +01:00
Laurent Destailleur
0839b39c52 Fix translation 2019-02-09 19:15:36 +01:00
Laurent Destailleur
d38ead798a Trans 2019-02-09 19:12:24 +01:00
Laurent Destailleur
c77d328f12 Fix translation 2019-02-09 19:05:15 +01:00
Frédéric FRANCE
2020e199b2
Update paiement.php 2019-02-09 16:35:10 +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
7f4bbcf9a5 Some minor fix in default values and modulebuilder 2019-02-09 13:40:22 +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
d6628a87a9 Fix phpcs 2019-02-08 17:48:24 +01:00
atm-quentin
300438b290 FIX on chrome you can send multiple form if you click more than once on button 2019-02-08 15:57:08 +01:00
Lionel VESSILLER
70dfecaa0b Fix calcul margin by seller and parameters send (filters) 2019-02-08 15:48:43 +01:00
Laurent Destailleur
f333fb3b7d Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-02-08 14:59:07 +01:00
Laurent Destailleur
8412a91576 Fix do not send email if approval error 2019-02-08 14:58:46 +01:00
Laurent Destailleur
7f9d995c9c Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/holiday/card.php
 2019-02-08 14:54:31 +01:00
Laurent Destailleur
2e1201b7b0 FIX Transaction on leave approval and decrease ko if setup not complete 2019-02-08 14:47:03 +01:00
Laurent Destailleur
ed733fb82d Fix phpcs 2019-02-08 13:28:10 +01:00
Laurent Destailleur
766ef36ea3 Standardize code of page of leave movements 2019-02-08 13:26:59 +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
Maxime Kohlhaas
da361f0ea5 Fix wrong column name in purchase journal 2019-02-08 12:24:07 +01:00
Laurent Destailleur
a40d4ddbaa Fix phpcs 2019-02-08 12:23:04 +01:00
Laurent Destailleur
1611c613f5 Fix phpcs 2019-02-08 12:19:51 +01:00