2
0
forked from Wavyzz/dolibarr
Commit Graph

84710 Commits

Author SHA1 Message Date
andreubisquerra
4b7de1e5f5 Remove vars to avoid conficts in TakePOS setup 2020-03-21 15:48:25 +01:00
Laurent Destailleur
7370268b13 Tool to regenerate files 2020-03-21 11:04:33 +01:00
Laurent Destailleur
39af3635c5 Responsive 2020-03-20 21:50:34 +01:00
Laurent Destailleur
640ee5277c FIX Look and feel v11 2020-03-20 21:19:43 +01:00
Laurent Destailleur
588692760a FIX Look and feel v11 2020-03-20 21:16:52 +01:00
Laurent Destailleur
68cadb58bb Fix better default sort order 2020-03-20 20:36:26 +01:00
Laurent Destailleur
27015fc6f6 NEW Add method to add social network sharing buttons on blog posts 2020-03-20 19:34:49 +01:00
Laurent Destailleur
a2f9f72973 Enhance website module 2020-03-20 18:58:45 +01:00
Laurent Destailleur
f904ff5240 Add dol_escape_json method 2020-03-20 17:10:35 +01:00
Laurent Destailleur
aa1f601528 FIX Backto link 2020-03-20 16:30:45 +01:00
Laurent Destailleur
43763771a6 FIX Backto link 2020-03-20 15:47:50 +01:00
Laurent Destailleur
4e007fe94c Import jommla news 2020-03-20 15:12:50 +01:00
Laurent Destailleur
e61222504a Look and feel 2020-03-20 11:49:00 +01:00
Laurent Destailleur
e0fd80af1f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-03-20 10:51:47 +01:00
Laurent Destailleur
5f0f376817 Merge pull request #13334 from OPEN-DSI/new-takepos-group-same-product
NEW add a parameter to group same product
2020-03-20 10:45:06 +01:00
Laurent Destailleur
a0086d73a1 Merge pull request #13371 from aspangaro/12.0_a23
Work on split module fournisseur
2020-03-20 10:37:54 +01:00
Laurent Destailleur
aae0be492f Dolibarr logo in puce css <span class="fa fa-dolibarr-css"></span> 2020-03-20 10:28:47 +01:00
Laurent Destailleur
0574e1df9f Merge pull request #13386 from aspangaro/12.0_a24
FIX: Load the translation file for extrafields
2020-03-20 10:05:41 +01:00
Laurent Destailleur
5ffc57f3f0 Update extrafields.class.php 2020-03-20 10:05:08 +01:00
Laurent Destailleur
222556b464 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/accounting-files.php
	htdocs/core/lib/functions.lib.php
2020-03-19 22:09:17 +01:00
Laurent Destailleur
87e808fec4 Fix phpcs 2020-03-19 22:07:20 +01:00
Laurent Destailleur
a413e2861e Fix edit html 11.0.3 2020-03-19 21:13:15 +01:00
Laurent Destailleur
03b261d54c Provide information of thirdparty, contact or project to SMS handler 2020-03-19 19:11:34 +01:00
Laurent Destailleur
d9f616d6e3 Avoid file xxx_preview-1.png into export 2020-03-19 15:59:49 +01:00
Laurent Destailleur
9be4b28bea FIX mass action on stock movements 2020-03-19 15:43:55 +01:00
Laurent Destailleur
c71da5d013 FIX mass action on stock movements 2020-03-19 15:43:06 +01:00
Laurent Destailleur
303961b0a6 Fix trans 2020-03-19 12:10:22 +01:00
Laurent Destailleur
7eb4522636 FIX missing token and save of survey description 2020-03-19 11:59:57 +01:00
Alexandre SPANGARO
a6227aeb6a FIX: Load the translation file for extrafields 2020-03-19 11:53:42 +01:00
Alexandre SPANGARO
bac099dc60 Merge remote-tracking branch 'upstream/develop' into 12.0_a23 2020-03-19 11:48:21 +01:00
Laurent Destailleur
8e1ffa5144 Fix management of token 2020-03-19 10:52:07 +01:00
Laurent Destailleur
fca6d45baa NEW Overwrite tpl with module_part['tpl'] is deprecated. USe hooks
instead.
2020-03-19 10:15:34 +01:00
Laurent Destailleur
c94c33696a Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-03-19 09:58:04 +01:00
Laurent Destailleur
d38c6616e6 Doc 2020-03-19 09:53:20 +01:00
Laurent Destailleur
56d6c4691f FIX #13382 Note will be concat to private note 2020-03-18 21:06:36 +01:00
Laurent Destailleur
25b62646b6 Fix we must supplier codes 2020-03-18 20:26:28 +01:00
Laurent Destailleur
009746ab79 Invert seller and buyer 2020-03-18 19:59:18 +01:00
Laurent Destailleur
6c3b6c7a54 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-03-18 19:56:02 +01:00
Laurent Destailleur
6298071f83 CSS 2020-03-18 19:55:49 +01:00
Laurent Destailleur
a848c77fce Merge pull request #13375 from bb2a/patch-25
NEW Add tel and fax in warehouse card
2020-03-18 19:47:34 +01:00
Laurent Destailleur
6b3826cbb8 Merge branch 'develop' into patch-25 2020-03-18 19:47:25 +01:00
Laurent Destailleur
54d3703c42 Prepare 11.0.3 2020-03-18 19:45:47 +01:00
Laurent Destailleur
d3e7d61bed Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-03-18 19:42:30 +01:00
Laurent Destailleur
ef1285f050 css 2020-03-18 19:42:20 +01:00
Laurent Destailleur
9f65c4a7db Merge pull request #13369 from OPEN-DSI/new-takepos-freezone-vat-rate
NEW add VAT rates on free zone in cash desk
2020-03-18 19:37:04 +01:00
Laurent Destailleur
21de447d9e Merge pull request #13349 from TobiasSekan/AddSubstitutForUserCivility
NEW "contact_civility" for ODT templates
2020-03-18 19:31:10 +01:00
Laurent Destailleur
c7c0eba10b Merge pull request #13370 from atm-florian/11.0
fix wrong DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_ called
2020-03-18 19:29:05 +01:00
Laurent Destailleur
a141f46e91 Merge pull request #13354 from OPEN-DSI/new-takepos-reduction-global-labels
NEW labels on reduction buttons in cash desk
2020-03-18 19:28:08 +01:00
Laurent Destailleur
8fa505422e Merge pull request #13378 from atm-florian/develop
NEW: Export module, add extrafields for Contract and Contract line
2020-03-18 19:27:24 +01:00
Laurent Destailleur
ea13c707a2 Merge pull request #13380 from atm-john/11.0_fix_import_lines_from_object_for_situation_invoices
FIX import lines from object for situation invoices
2020-03-18 19:25:04 +01:00