Commit Graph

87205 Commits

Author SHA1 Message Date
ptibogxiv
63d9e3c01e
fix list stripe charge.php
payment intent use table_element so need double terms for more compatibility
2020-01-27 15:11:22 +01:00
Francis Appels
f714147b18 Merge remote-tracking branch 'Dolibarr/11.0' into 11 2020-01-27 15:00:52 +01:00
Laurent Destailleur
5feea89a94 Fix responsive for public interface 2020-01-27 14:11:40 +01:00
Laurent Destailleur
29853b5fbd Fix responsive for public interface of tickets 2020-01-27 14:01:35 +01:00
Laurent Destailleur
90d255d3c4 Look and feel v11 2020-01-27 13:43:03 +01:00
Laurent Destailleur
c4ac1469df Look and feel v11 2020-01-27 13:42:31 +01:00
Laurent Destailleur
c103ff58cf FIX update of llx_societe_account for stripe customer key. 2020-01-27 12:41:22 +01:00
Laurent Destailleur
7b65cdb75a FIX update of llx_societe_account for stripe customer key. 2020-01-27 12:40:20 +01:00
AdrianDominik
19f9566da0 Merge remote-tracking branch 'origin/11.0' into 11.0 2020-01-27 11:02:40 +01:00
AdrianDominik
b3e5fcff10 FIX: #12908 User login with credentials from self-subscription form fails 2020-01-27 11:01:13 +01:00
stickler-ci
dc0237f0e1 Fixing style errors. 2020-01-27 09:58:18 +00:00
AdrianDominik
bcdf19f0ff FIX: #12908 User login with credentials from self-subscription form fails 2020-01-27 10:54:08 +01:00
AdrianDominik
fe23d9ac71 Merge remote-tracking branch 'upstream/11.0' into 11.0 2020-01-27 10:50:44 +01:00
Pierre Ardoin
4cb423e5c7
Add un specific link to late invoices
Before : $response->url_late always == $response->url
After : if $response->nbtodolate >= 1 : $response->url_late redirects to list with only late unpaid customer invoices.
2020-01-27 09:49:49 +01:00
Pierre Ardoin
e0c8fce229
Fix link direction for late supplier invoices
Before : $response->url_late always == $response->url
After : if $response->nbtodolate >= 1 : $response->url_late redirects to list with only late unpaid supplier invoices.
2020-01-27 09:39:38 +01:00
Tobias Sekan
245b6e6554
Update agendaexport.php after review 2020-01-27 08:28:14 +01:00
Tobias Sekan
ce9d1a320f
Update actioncomm.class.php after review 2020-01-27 08:27:13 +01:00
Alexandre SPANGARO
e70e74de94 NEW: Accountancy - General ledger - Add an option to search not lettering line 2020-01-27 05:21:56 +01:00
Alexandre SPANGARO
d5ff006171 NEW: Accountancy - General ledger - Add an option to search not lettering line 2020-01-27 05:20:48 +01:00
Laurent Destailleur
89e9b9391b Fix responsive 2020-01-27 02:26:07 +01:00
Laurent Destailleur
50e077ec59
Merge pull request #12890 from andreubisquerra/master
NEW Colorful theme for TakePOS
2020-01-27 02:22:37 +01:00
Laurent Destailleur
0271a43e80
Merge branch 'develop' into master 2020-01-27 02:17:14 +01:00
Laurent Destailleur
50d9ac0b52 Fix else if 2020-01-27 02:13:12 +01:00
Laurent Destailleur
2d77765613 css 2020-01-27 02:11:37 +01:00
Laurent Destailleur
d4223c3d82 TakePOS can use the same CSS properties than app 2020-01-27 02:06:34 +01:00
Laurent Destailleur
df478dc170 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-27 01:53:49 +01:00
Laurent Destailleur
42db2a33eb Fix phpcs 2020-01-27 01:52:35 +01:00
Laurent Destailleur
7438f92912 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/compta/prelevement/create.php
	htdocs/compta/prelevement/demandes.php
	htdocs/compta/tva/document.php
	htdocs/fourn/ajax/getSupplierPrices.php
	htdocs/societe/card.php
2020-01-27 01:50:02 +01:00
Laurent Destailleur
37f5922bf8 Fix conflict 2020-01-27 01:38:50 +01:00
andreubisquerra
a8656fe612 Travis fix 2020-01-27 01:36:31 +01:00
Laurent Destailleur
539348bbbb Responsive TakePOS with Bar. 2020-01-27 01:31:39 +01:00
Laurent Destailleur
6744fc4279 Fix takepos permissions 2020-01-27 00:38:28 +01:00
Laurent Destailleur
3ece94fb2e Fix class not found 2020-01-27 00:06:10 +01:00
Laurent Destailleur
2177116f83
Merge pull request #12499 from altatof/updtask
NEW : allow time consumed to be linked to another task
2020-01-26 23:58:28 +01:00
Laurent Destailleur
17ceeb6a6e
Merge pull request #12729 from frederic34/patch-6
NEW upload odt models for order
2020-01-26 23:55:04 +01:00
Laurent Destailleur
9cd2a63752
Merge pull request #12739 from frederic34/patch-7
NEW upload odt models for proposal
2020-01-26 23:49:31 +01:00
Laurent Destailleur
4a5dca4a3d Fix test 2020-01-26 23:48:40 +01:00
Laurent Destailleur
d6830e0d04
Merge pull request #12818 from glafarge/patch-1
New : Add native spellcheck to CKEditor
2020-01-26 23:31:27 +01:00
Laurent Destailleur
fd50074b42
Update doleditor.class.php 2020-01-26 23:31:19 +01:00
Laurent Destailleur
ecaacc9543 FIX #12875 2020-01-26 23:27:47 +01:00
Laurent Destailleur
69ce8b543e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-01-26 23:22:59 +01:00
Laurent Destailleur
d13e5bc90b FIX #12875 2020-01-26 23:22:47 +01:00
Laurent Destailleur
44bc0392eb
Merge pull request #12925 from atm-gauthier/10.0_fixthirdaliasalias
FIX : thirdparty alias name desappeared if we change country with THI…
2020-01-26 22:34:29 +01:00
Laurent Destailleur
009264a46b
Merge pull request #12924 from aspangaro/12.0_a9
NEW: Add hook on margin list page
2020-01-26 22:34:12 +01:00
Laurent Destailleur
2e7c615e80
Merge pull request #12928 from atm-greg/FIX_10.0_date_filters_on_contract_service_list
FIX date filter not used if no operator
2020-01-26 22:33:42 +01:00
Laurent Destailleur
64fab28648
Merge pull request #12926 from atm-greg/FIX_10.0_form_reload_on_country_id_change
fix lost name_alias on country selection
2020-01-26 22:33:12 +01:00
Laurent Destailleur
3215af9900
Merge pull request #12923 from simicar29/develop
New: Add Hook doPreMassActions
2020-01-26 22:32:46 +01:00
Laurent Destailleur
02f8faeeac
Update massactions_pre.tpl.php 2020-01-26 22:32:37 +01:00
Laurent Destailleur
57bbe66612
Merge pull request #12929 from atm-gauthier/10.0_orderby_extrafieldsinexport
FIX : Extrafield position in export field list must respect "pos" field
2020-01-26 22:30:02 +01:00
Laurent Destailleur
7e98414e3e
Merge pull request #12915 from gti-eu/11.0
Fix reference check on emailcollector
2020-01-26 22:29:15 +01:00