Commit Graph

83748 Commits

Author SHA1 Message Date
AdrianDominik
c5eced95b8 Merge remote-tracking branch 'upstream/11.0' into 11.0 2020-01-28 09:23:47 +01:00
Tobias Sekan
713fb1a290
Fix additional space after card name 2020-01-28 08:55:49 +01:00
Tobias Sekan
0f4420407d
Merge pull request #6 from Dolibarr/develop
merge from develop
2020-01-28 08:52:50 +01:00
Laurent Destailleur
40636adb56 Enhance #12865
No need of option. A new parameter on url is enough.
2020-01-28 03:34:56 +01:00
Laurent Destailleur
51d750cb49
Merge pull request #12865 from TobiasSekan/ExportIcalWithHolidays
New: Export ical with holidays
2020-01-28 03:19:34 +01:00
Laurent Destailleur
751247d3f3
Merge pull request #12935 from mapiolca/patch-24
Fix link direction for late supplier invoices
2020-01-28 02:59:25 +01:00
Laurent Destailleur
c0aa712ad0
Merge pull request #12936 from mapiolca/patch-25
Add un specific link to late invoices
2020-01-28 02:54:12 +01:00
Laurent Destailleur
72f719382c
Merge pull request #12939 from ptibogxiv/patch-295
fix list stripe charge.php
2020-01-28 02:52:01 +01:00
Laurent Destailleur
f64ad71924 Missing country code 2020-01-28 02:50:11 +01:00
Laurent Destailleur
c2c80bf40f Fix Look and feel v11 2020-01-28 02:44:41 +01:00
Laurent Destailleur
fc63d7366d FIX Mandatory fields must stay mandatory if create/update submit fails 2020-01-27 22:23:40 +01:00
Laurent Destailleur
4fe942985f FIX Mandatory fields must stay mandatory if create/update submit fails 2020-01-27 22:22:59 +01:00
Laurent Destailleur
a230a0aa13 Fix url to pay 2020-01-27 21:37:52 +01:00
Laurent Destailleur
a02a2a6def Sync transifex 2020-01-27 16:07:53 +01:00
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