Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-03-02 16:45:52 +01:00
Code Issues Packages Projects Releases Wiki Activity
85,185 Commits 39 Branches 192 Tags
97e9913f86fbeae5226aef2d32c19a87b676df31
Commit Graph

5933 Commits

Author SHA1 Message Date
Laurent Destailleur
8e7ad726b2 NEW Easier way to setup the different types of tax. Better visibility. 
FIX edit of tax stamp regenerated the PDF.
 2020-04-07 14:06:08 +02:00
Laurent Destailleur
809c741d11 Can use font awesome as picto of object and modules. 2020-04-06 15:34:28 +02:00
Laurent Destailleur
082b205149 WIP Work on Kanban view for module list 2020-04-06 15:12:42 +02:00
Laurent Destailleur
b1c5490a74 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/tpl/extrafields_add.tpl.php
	htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_advanced.php
 2020-04-05 04:03:53 +02:00
Scrutinizer Auto-Fixer
612bac6598 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-04-05 00:44:59 +00:00
Laurent Destailleur
ed0f6b56b9 FIX: The "test smtp connectivity" failed on page to setup mass emailing 2020-04-05 00:29:34 +02:00
Laurent Destailleur
28a1b7af35 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/modulebuilder/index.php
	htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_advanced.php
	htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_standard.php
	htdocs/supplier_proposal/class/supplier_proposal.class.php
 2020-04-03 18:07:24 +02:00
Laurent Destailleur
a5a5fe55f6 Code simpler 2020-04-03 14:55:46 +02:00
Laurent Destailleur
644d83d799 Rename field to avoid confusion 2020-04-02 19:42:08 +02:00
Laurent Destailleur
4220236aa8 Merge pull request #13425 from andreubisquerra/develop 
NEW: CUPS printing compatibility for TakePOS
 2020-03-30 18:56:14 +02:00
Laurent Destailleur
d5b107211f Look and feel v12 2020-03-28 15:20:26 +01:00
Laurent Destailleur
ec83f18944 Move more icon definition into CSS 2020-03-28 13:38:25 +01:00
Laurent Destailleur
354cb8c1b0 Work on Kanban view for modules 2020-03-27 01:59:17 +01:00
andreubisquerra
3e4b788316 Update receiptprinter.php with CUPS 2020-03-25 21:23:55 +01:00
Laurent Destailleur
6f1b9c4678 Fix colspan 2020-03-25 18:24:39 +01:00
Laurent Destailleur
3c572c1909 Debug multicurrency 2020-03-25 17:24:20 +01:00
Laurent Destailleur
a5379c7144 FIX All forms must use newToken() 
Conflicts:
	htdocs/commande/card.php
	htdocs/compta/cashcontrol/cashcontrol_card.php
	htdocs/supplier_proposal/card.php
 2020-03-24 13:14:23 +01:00
Laurent Destailleur
1ff15e1fd9 FIX All forms must use newToken() 2020-03-24 13:10:35 +01:00
Scrutinizer Auto-Fixer
e8083e2a65 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-03-23 14:54:02 +00:00
Laurent Destailleur
3d6849dfea Fix label of tabs 2020-03-22 17:27:08 +01:00
Laurent Destailleur
ce47351b76 Trans 2020-03-22 17:11:58 +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
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
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
7eb4522636 FIX missing token and save of survey description 2020-03-19 11:59:57 +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
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
b9f404b5fa Fix form inside table 2020-03-18 19:07:15 +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
Alexandre SPANGARO
033f796398 Work on split module fournisseur 2020-03-17 14:51:48 +01:00
UT from dolibit
8e712c6d0e Update https for country websites 
Update https for country websites
 2020-03-16 13:13:11 +01:00
Laurent Destailleur
33c5db9cc3 Prepare code for the new pagination possibility 2020-03-13 13:07:11 +01:00
Scrutinizer Auto-Fixer
f413ce6aac Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-03-12 11:45:44 +00:00
Laurent Destailleur
148e2e58e5 Fix MAIN_SHOW_LOGO 2020-03-07 17:37:08 +01:00
Laurent Destailleur
119784fb3d Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-03-07 17:34:01 +01:00
Jean Traullé
a6e3980acb Update ihm.php 2020-03-06 17:35:03 +01:00
Jean Traullé
ddf87e6d80 Fix param lost 
Reported on https://www.dolibarr.fr/forum/t/v11-petites-regressions/32228
 2020-03-06 16:13:09 +01:00
Laurent Destailleur
7d0d0aa75a Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
 2020-03-04 01:56:50 +01:00
Laurent Destailleur
6f3197bbea Merge pull request #13258 from atm-ph/fix_11.0_dict_sql_error_sortorder 
Fix sql syntax error
 2020-03-03 22:54:11 +01:00
Laurent Destailleur
d5546df57b Responsive 2020-03-03 22:50:37 +01:00
Laurent Destailleur
fd64f0fadb Fix responsive 2020-03-03 22:46:29 +01:00
Laurent Destailleur
88d2e13f02 Fix reponsive 2020-03-03 22:15:55 +01:00
atm-ph
e916ff40ff Fix sql syntax error 2020-03-03 11:55:05 +01:00
Laurent Destailleur
a3e56994b6 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	.travis.yml
	htdocs/admin/company.php
	htdocs/compta/tva/document.php
	htdocs/core/lib/files.lib.php
	htdocs/main.inc.php
 2020-02-27 18:35:32 +01:00
Laurent Destailleur
b326d1fe49 Add link to wiki doc 2020-02-27 18:26:38 +01:00
Laurent Destailleur
f039008282 Fix reponsive 2020-02-27 16:33:24 +01:00