2
0
forked from Wavyzz/dolibarr
Commit Graph

84710 Commits

Author SHA1 Message Date
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
0759ebe01e Merge pull request #13383 from FHenry/dev_NEW_setup_SeparateurCSV
NEW: add csv separator setup in module admin
2020-03-18 19:13:51 +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
103daf736d Merge pull request #13355 from dolibit-ut/patch-15
Update README.md
2020-03-18 18:31:33 +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
Laurent Destailleur
56e4fa1bb3 Trans 2020-03-18 14:01:11 +01:00
ATM john
c767e553d3 fix import line from object default value for situations 2020-03-18 10:59:13 +01:00
ATM john
4f1dd5439f Merge branch '11.0_fix_situations_invoices_stuff' of github.com:atm-john/dolibarr into 11.0_fix_situations_invoices_stuff 2020-03-18 10:35:49 +01:00
ATM john
7b8cafb710 remove var_dump 2020-03-18 10:34:44 +01:00
stickler-ci
0a5f971eb5 Fixing style errors. 2020-03-18 09:32:34 +00: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
stickler-ci
1bff748c94 Fixing style errors. 2020-03-18 00:24:40 +00:00
Anthony Berton
82058f3a78 add phone 2020-03-18 01:17:54 +01:00
Anthony Berton
71e22ee11b Update 11.0.0-12.0.0.sql 2020-03-18 00:55:20 +01:00
Anthony Berton
9fa4f245cc Update list.php 2020-03-18 00:03:26 +01:00
Laurent Destailleur
a76392f944 Responsive 2020-03-17 21:26:25 +01:00
ATM john
075757eb3d Fix situation value transmission 2020-03-17 16:49:05 +01:00
Alexandre SPANGARO
033f796398 Work on split module fournisseur 2020-03-17 14:51:48 +01:00
Laurent Destailleur
9525289488 Fix return code of some API 2020-03-17 13:50:20 +01:00
Laurent Destailleur
76fc722638 NEW Can get some variables (not available by default) 2020-03-17 13:33:21 +01:00
ATM john
cb43928a5d Fix radio label target 2020-03-17 12:29:14 +01:00
florian HENRY
1d05531aa8 fix wrong DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_ called 2020-03-17 10:10:54 +01:00
VESSILLER
0e171e81e6 Merge branch 'develop' of github.com:OPEN-DSI/dolibarr into new-takepos-freezone-vat-rate 2020-03-17 09:57:21 +01:00