lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
87,132 Commits 43 Branches 150 Tags 886 MiB
788ec1f87d
Commit Graph

87132 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
926a9f68c4 Trans 2020-05-30 00:23:14 +02:00
Laurent Destailleur
455ba002b4 css 2020-05-29 22:13:10 +02:00
Laurent Destailleur
7fc6917cfd Debug feature of alternate languages 2020-05-29 22:01:02 +02:00
Laurent Destailleur
b3118d0189 Debug feature of alternate languages 2020-05-29 21:59:33 +02:00
Laurent Destailleur
540a64bbba Fix templates 2020-05-29 21:48:33 +02:00
Laurent Destailleur
264fd709e4 Fix template 2020-05-29 21:48:27 +02:00
Laurent Destailleur
30aa50684f Trans 2020-05-29 21:47:59 +02:00
Laurent Destailleur
c2a9819daa Debug establishment management 2020-05-29 21:45:50 +02:00
Laurent Destailleur
9d2f67bf8c Trans 2020-05-29 16:35:01 +02:00
kamel
1e208e537f FIX: Fix link of the button to create a credit note and fix the awareness of a error happen when to create a credit note 2020-05-29 16:24:07 +02:00
kamel
a4800f7b9b FIX: Fix link of the button to create a credit note and fix the awareness of a error happen when to create a credit note 2020-05-29 16:18:27 +02:00
Laurent Destailleur
21c58e9fab Error management 2020-05-29 15:29:47 +02:00
Laurent Destailleur
7f8c0d0e7a Fix templates 2020-05-29 15:29:33 +02:00
Laurent Destailleur
972430d50c Fix template 2020-05-29 15:13:16 +02:00
Laurent Destailleur
91f5f8053a Fix label 2020-05-29 13:46:27 +02:00
Laurent Destailleur
ab82797dfc var not defined 2020-05-29 13:20:33 +02:00
Laurent Destailleur
f38118790e Trans 2020-05-29 12:18:47 +02:00
Laurent Destailleur
b9051bbe22 Fix admin report 2020-05-29 09:50:38 +02:00
Laurent Destailleur
b11ef125c3 FIX Force of HTML content only for ckeditor 
Conflicts:
	htdocs/modulebuilder/index.php
 2020-05-29 03:27:30 +02:00
Laurent Destailleur
a0a440cf5f FIX Force of HTML content only for ckeditor 2020-05-29 03:26:05 +02:00
Laurent Destailleur
c5ace5774e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-29 03:21:25 +02:00
Laurent Destailleur
9224061aed Fix test to upload a file 2020-05-29 03:20:44 +02:00
Laurent Destailleur
4a99f833c5 Fix test to upload a file 2020-05-29 03:20:37 +02:00
Laurent Destailleur
5a9d968a75 Fix MAIN_BUGTRACK_ENABLELINK and MAIN_HELP_DISABLELINK setting 2020-05-29 00:02:03 +02:00
Laurent Destailleur
bc9201b073 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-28 21:36:16 +02:00
Laurent Destailleur
3b22b6192d Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-28 21:36:08 +02:00
Laurent Destailleur
60dfcdba00 Fix var type 2020-05-28 21:29:30 +02:00
Laurent Destailleur
46a362b7d8 doxygen 2020-05-28 21:25:47 +02:00
Laurent Destailleur
c1b4f7ec28 Fix phpcs 2020-05-28 21:24:46 +02:00
Laurent Destailleur
2e0cf05e55 phpcs 2020-05-28 21:20:30 +02:00
Laurent Destailleur
79c2d96375
Merge pull request #13679 from TobiasSekan/cleanupUserRightsSupplierProposalCard 
Cleanup user rights on supplier proposal card
 2020-05-28 21:12:37 +02:00
Laurent Destailleur
ba1e067d32
Merge pull request #13678 from TobiasSekan/cleanupUserRightsForunCommandeCard 
Cleanup user rights forun commande card
 2020-05-28 21:12:23 +02:00
Laurent Destailleur
c7eb71e19e
Merge pull request #13676 from TobiasSekan/CleanupUserRightsForunFactureCard 
Cleanup user rights on forun facture card
 2020-05-28 21:11:58 +02:00
Laurent Destailleur
2836368017 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/extrafields.class.php
	htdocs/filefunc.inc.php
	htdocs/takepos/css/phone.css
	htdocs/takepos/invoice.php
 2020-05-28 20:20:39 +02:00
Laurent Destailleur
3606ed2bda Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/adherents/class/adherent.class.php
 2020-05-28 20:17:26 +02:00
Laurent Destailleur
5cec3eb052 Prepare 12.0 2020-05-28 20:12:49 +02:00
Laurent Destailleur
6cbb87f224 FIX #13995 #13994 manually. 2020-05-28 20:12:06 +02:00
Laurent Destailleur
7fbacf4352 phpcs 2020-05-28 20:04:30 +02:00
Laurent Destailleur
1992b633ba Fix phpcs 2020-05-28 20:02:07 +02:00
Laurent Destailleur
56d3a5ecf2 Fix look and feel v12 2020-05-28 19:43:12 +02:00
Laurent Destailleur
11aedcd71a Fix look and feel v12 2020-05-28 19:42:10 +02:00
Laurent Destailleur
f8b92e507c Clean code 2020-05-28 19:10:06 +02:00
Laurent Destailleur
cf924e11e9
Merge pull request #13825 from bb2a/Add-option-in-stock-for-affect-warehouse- 
NEW Add option to define a default warehouse at user level
 2020-05-28 18:41:54 +02:00
Laurent Destailleur
0e9d8e9300 Merge branch 'TobiasSekan-NewVendorInvoiceArea' into develop 2020-05-28 18:33:14 +02:00
Laurent Destailleur
a92e952960 Merge branch 'NewVendorInvoiceArea' of 
https://github.com/TobiasSekan/dolibarr into
TobiasSekan-NewVendorInvoiceArea

# Conflicts:
#	htdocs/langs/en_US/bills.lang
 2020-05-28 18:32:52 +02:00
Laurent Destailleur
1e76101c41 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-28 18:30:32 +02:00
Laurent Destailleur
791d147992 Merge branch 'NewCustomerInvoiceArea' of 
https://github.com/TobiasSekan/dolibarr into develop

# Conflicts:
#	htdocs/langs/en_US/bills.lang
 2020-05-28 18:29:59 +02:00
Laurent Destailleur
113144ea21
Merge pull request #13993 from glu000/11.0-fix-13991 
Fix #13991
 2020-05-28 18:27:39 +02:00
Laurent Destailleur
278f413a7a
Merge pull request #13980 from OPEN-DSI/new_save_filter_project_index 
NEW Save filter of the project homepage
 2020-05-28 18:26:26 +02:00
Supermanu
fd868b9d67 Fix compatibility with delete perm in massactions 2020-05-28 17:57:00 +02:00