Commit Graph

83408 Commits

Author SHA1 Message Date
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
Laurent Destailleur
627fa996a3 Merge pull request #12922 from simicar29/simicar29-patch-2
Update "submitted only" module options
2020-01-26 22:27:54 +01:00
Laurent Destailleur
842a9b9ef7 Merge pull request #12917 from ptibogxiv/patch-294
fix sql on order list
2020-01-26 22:25:33 +01:00
Laurent Destailleur
cf6b9f7d03 Merge pull request #12918 from atm-florian/11_fixWithdrwLineList
fix SEPA lines with limit select and working pagination
2020-01-26 22:25:01 +01:00
Laurent Destailleur
ae087d665c Merge pull request #12916 from RubenRuCh/11.0
Fix: strict mode mysql compatibility
2020-01-26 22:24:25 +01:00
Laurent Destailleur
14f1f98b59 Merge pull request #12919 from atm-florian/10_fixCreateSEPALimitAndPagination
10 fix create sepa limit and pagination
2020-01-26 22:24:11 +01:00
Laurent Destailleur
506bfd8371 Merge pull request #12930 from mapiolca/patch-23
Permissions Issue
2020-01-26 22:23:47 +01:00
Laurent Destailleur
08841d4475 Update receipt.php 2020-01-26 22:14:31 +01:00
Laurent Destailleur
eff9fae261 Update receipt.php 2020-01-26 22:14:27 +01:00
javierybar
cb0986db8b TakePOS price rounding 2020-01-26 22:14:11 +01:00
Laurent Destailleur
ce981e558c Merge pull request #12921 from javierybar/develop
TakePOS price rounding in receipt
2020-01-26 22:13:42 +01:00
Laurent Destailleur
9a1051116e Update receipt.php 2020-01-26 22:12:52 +01:00
Laurent Destailleur
3e8d2407c8 Update receipt.php 2020-01-26 22:12:26 +01:00
Laurent Destailleur
be29795f7f Merge pull request #12905 from laudeco/hotfix/qty_negative_stock
fix minimum quantity on stock movement
2020-01-26 22:09:43 +01:00
Laurent Destailleur
8ff19a2a0f WIP search component 2020-01-26 22:02:31 +01:00
Laurent Destailleur
68f5aee432 Fix global stats for holiday 2020-01-26 19:38:19 +01:00
Francis Appels
3318263840 Merge remote-tracking branch 'Dolibarr/11.0' into 11 2020-01-26 12:17:46 +01:00