Commit Graph

74390 Commits

Author SHA1 Message Date
Laurent Destailleur
303961b0a6 Fix trans 2020-03-19 12:10:22 +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
6b3826cbb8
Merge branch 'develop' into patch-25 2020-03-18 19:47:25 +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
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
Laurent Destailleur
8c34a091b4 Fix import 2020-03-18 19:24:11 +01:00
Laurent Destailleur
30b48a9ee3 Fix update 2020-03-18 19:21:32 +01:00
Laurent Destailleur
87edf27bbf
Merge branch 'develop' into dev_NEW_setup_SeparateurCSV 2020-03-18 19:12:52 +01:00
Laurent Destailleur
a56a3d64b3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-03-18 19:07:26 +01:00
Laurent Destailleur
b9f404b5fa Fix form inside table 2020-03-18 19:07:15 +01:00
Laurent Destailleur
2c3bd78095
Merge pull request #13353 from FHenry/dev_addHookOnSelectUserORSalesRep
new : Add hook on select user or sales rep
2020-03-18 18:56:56 +01:00
Laurent Destailleur
aeae8b4300
Merge pull request #13348 from aspangaro/12.0_a21
Work on reconcilation of accouting account
2020-03-18 18:56:03 +01:00
Laurent Destailleur
3f4a7b2387
Merge pull request #13350 from TobiasSekan/FixMissingUserInOdtSupProposal
FIX missing "contact_" substitution in supplier proposal (ODT template)
2020-03-18 18:55:03 +01:00
Laurent Destailleur
3b1c02ae46 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-03-18 18:51:05 +01:00
Laurent Destailleur
8bab245c7e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	ChangeLog
	htdocs/core/tpl/contacts.tpl.php
2020-03-18 18:50:55 +01:00
Laurent Destailleur
b41ac2a428 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-03-18 18:37:55 +01:00
Laurent Destailleur
a3328c5ef3 Fix div 2020-03-18 18:37:44 +01:00
Laurent Destailleur
bf10ad2041
Merge pull request #13357 from dolibit-ut/patch-17
Update
2020-03-18 18:31:52 +01:00
Laurent Destailleur
fc9ddd5447
Merge pull request #13356 from dolibit-ut/patch-16
Update https for country websites
2020-03-18 18:31:06 +01:00
Laurent Destailleur
f12881b3f8
Merge pull request #13360 from dolibit-ut/patch-20
create README.txt
2020-03-18 18:29:26 +01:00
Laurent Destailleur
5c881ee1d4
Merge pull request #13361 from dolibit-ut/patch-21
Create README.txt
2020-03-18 18:28:37 +01:00
Laurent Destailleur
e9e0ce591b
Merge pull request #13379 from atm-lena/11.0_FIX_extrafields_add_tpl_include
FIX : wrong include - replace extrafields_create.tpl.php to extrafiel…
2020-03-18 18:26:57 +01:00
Laurent Destailleur
1c76abb748
Merge pull request #13363 from dolibit-ut/patch-23
update https
2020-03-18 18:25:54 +01:00
Laurent Destailleur
11f2f12990
Merge pull request #13365 from dolibit-ut/patch-24
Update adodb-time.inc.php
2020-03-18 18:23:09 +01:00
Laurent Destailleur
c1931a045e
Merge pull request #13376 from fmarcet/11.0
FIX: Bank movements color is not showing
2020-03-18 18:22:46 +01:00
Laurent Destailleur
8a9d82e8d5
Merge pull request #13366 from dolibit-ut/patch-25
Create README.txt
2020-03-18 18:22:21 +01:00
Laurent Destailleur
889f1be0b6
Merge pull request #13367 from FHenry/dev_ldcompta10
fix ldcompta10
2020-03-18 18:21:55 +01:00
Laurent Destailleur
a848a8523a
Merge pull request #13377 from atm-john/11.0_fix_situations_invoices_stuff
Fix situations invoices stuff
2020-03-18 18:20:27 +01:00
Laurent Destailleur
e639e24993
Merge pull request #13352 from aspangaro/12.0_a22
FIX Update fiscalyear.class.php to filter on entity
2020-03-18 18:19:02 +01:00
florian HENRY
9bfc60064b ass credential 2020-03-18 15:12:02 +01:00
florian HENRY
15614abc3f NEW: add csv separator setup in module admin 2020-03-18 15:08:58 +01:00
Laurent Destailleur
cc93a40c45 Fix label of local tax 2020-03-18 14:06:15 +01:00
ATM john
c767e553d3 fix import line from object default value for situations 2020-03-18 10:59:13 +01:00
ATM john
7b8cafb710 remove var_dump 2020-03-18 10:34:44 +01:00
ATM john
d3aeec0a7c Fix situation value transmission 2020-03-18 10:30:15 +01:00
atm-lena
2e1554def4 FIX : wrong include - replace extrafields_create.tpl.php to extrafields_add.tpl.php 2020-03-18 10:18:52 +01:00
florian HENRY
50a0bfef64 NEW: Export module, add extrafields for Contract and Contract line 2020-03-18 09:53:13 +01:00
Ferran Marcet
1fe4e4415e FIX: Bank movements color is not showing 2020-03-18 09:27:08 +01:00