Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
91,506 Commits 36 Branches 189 Tags
eb0fd1674d26a8157ff133173f9177ee6a23e81f
Commit Graph

21986 Commits

Author SHA1 Message Date
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
21de447d9e Merge pull request #13349 from TobiasSekan/AddSubstitutForUserCivility 
NEW "contact_civility" for ODT templates
 2020-03-18 19:31:10 +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
87edf27bbf Merge branch 'develop' into dev_NEW_setup_SeparateurCSV 2020-03-18 19:12:52 +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
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
a3328c5ef3 Fix div 2020-03-18 18:37:44 +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
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
florian HENRY
50a0bfef64 NEW: Export module, add extrafields for Contract and Contract line 2020-03-18 09:53:13 +01:00
Laurent Destailleur
a76392f944 Responsive 2020-03-17 21:26:25 +01:00
Alexandre SPANGARO
033f796398 Work on split module fournisseur 2020-03-17 14:51:48 +01:00
Laurent Destailleur
76fc722638 NEW Can get some variables (not available by default) 2020-03-17 13:33:21 +01:00
Laurent Destailleur
5f255a6c14 A new way to navigate between pages in list is available 2020-03-17 03:24:24 +01:00
Laurent Destailleur
94750ed350 css 2020-03-17 01:31:48 +01:00
Laurent Destailleur
73f2e9e5de WIP migrate num_paiement into num_payment 
Fix label for free product in takepos
 2020-03-16 19:23:18 +01:00
Laurent Destailleur
4b1dd27c5f Move takepos.php file into index.php to match other dir structure 2020-03-16 15:41:21 +01:00
Alexandre SPANGARO
6b168428d8 Merge remote-tracking branch 'upstream/develop' into 12.0_a22 2020-03-16 12:11:01 +01:00
florian HENRY
ef83801a53 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_addHookOnSelectUserORSalesRep 2020-03-16 11:53:49 +01:00
florian HENRY
117ff5f4eb add hook to add sql filter in where clause on select users 2020-03-16 11:49:03 +01:00
Alexandre SPANGARO
301b97f6d2 FIX Update fiscalyear.class.php to filter on entity 2020-03-16 10:05:22 +01:00
Tobias Sekan
79caae9123 fix wrongly remoived center attributes 2020-03-16 09:59:58 +01:00
stickler-ci
711aff9ff7 Fixing style errors. 2020-03-16 08:56:10 +00:00
Tobias Sekan
41c0575a5d Fix not working sorting in contact view 2020-03-16 09:51:12 +01:00
stickler-ci
fd4e807211 Fixing style errors. 2020-03-16 07:40:10 +00:00
Tobias Sekan
debecabe69 FIX missing "contact_" substitution in supplier proposal 2020-03-16 08:38:01 +01:00
Tobias Sekan
c50f2b32d8 Add substitution for "user_civility" for ODT 2020-03-16 07:58:44 +01:00
Laurent Destailleur
22e8fdb46b Enhance #13033 2020-03-15 13:57:31 +01:00
Laurent Destailleur
aef827f826 Alias on same line than name 2020-03-14 14:47:01 +01:00
Laurent Destailleur
37fce0d3ee Fix position on merou 
Fix preselected value on contact
 2020-03-14 14:45:37 +01:00
Laurent Destailleur
f92943bee2 css 2020-03-14 03:24:46 +01:00
Laurent Destailleur
0d2d2302d5 Removed not relevant graph on stats on project 2020-03-14 03:18:49 +01:00
Laurent Destailleur
3b72005f93 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/card.php
	htdocs/filefunc.inc.php
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/cashdesk.lang
	htdocs/langs/fr_FR/errors.lang
	htdocs/langs/fr_FR/products.lang
	htdocs/langs/fr_FR/projects.lang
 2020-03-14 00:22:11 +01:00
Laurent Destailleur
a437125962 Merge pull request #13341 from OPEN-DSI/new-takepos-numbering-modules 
NEW add numbering module for cash desk
 2020-03-13 16:58:27 +01:00
Laurent Destailleur
99669583d5 Fix phpcs 2020-03-13 16:46:07 +01:00
Laurent Destailleur
d90bf25351 Fix phpcs 2020-03-13 13:11:04 +01:00
Laurent Destailleur
33c5db9cc3 Prepare code for the new pagination possibility 2020-03-13 13:07:11 +01:00
Laurent Destailleur
52290b002a NEW Another way to navigate between pages for some lists 2020-03-13 12:53:22 +01:00
Laurent Destailleur
893ae21d3a Fix phpcs 2020-03-13 11:29:27 +01:00
Laurent Destailleur
d3447bb44b Fix duplicate / 2020-03-13 10:14:26 +01:00
Laurent Destailleur
4bd1c6c717 Fix hreflink 2020-03-13 09:51:41 +01:00