Commit Graph

85743 Commits

Author SHA1 Message Date
Laurent Destailleur
1ed66bfe89 Fix bad tag 2020-04-22 13:51:23 +02:00
Laurent Destailleur
0b6d1a29c5 Fix links 2020-04-22 13:48:47 +02:00
Laurent Destailleur
c03ec4c001 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-04-22 13:47:44 +02:00
Laurent Destailleur
3588ae8792 Complete rules for PR 2020-04-22 13:47:33 +02:00
Laurent Destailleur
5c133b9c6c
Merge pull request #13686 from frederic34/patch-10
add extrafields in note for enstein and azur
2020-04-22 13:19:07 +02:00
Laurent Destailleur
22162ac57e Fix rounding of quantities 2020-04-22 13:14:50 +02:00
Laurent Destailleur
e91d263a6a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-04-22 12:57:02 +02:00
Laurent Destailleur
a5def19cff Fix calculation from a BOM > 1 2020-04-22 12:56:52 +02:00
Laurent Destailleur
e93db1f3c5
Merge pull request #13671 from leninrivas/develop
Fix calculator to consume with to produce
2020-04-22 12:56:29 +02:00
Laurent Destailleur
8754fc1d1e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-04-22 12:40:21 +02:00
Laurent Destailleur
9a5986e190 css 2020-04-22 12:40:11 +02:00
Laurent Destailleur
169378f276
Update mo.class.php 2020-04-22 12:34:02 +02:00
Laurent Destailleur
1788b1b252
Update mo.class.php
Use the accuracy of stock for rounding
2020-04-22 12:32:20 +02:00
Laurent Destailleur
5aa5e84702
Merge pull request #13688 from frederic34/patch-1
clean tab/whitespace
2020-04-22 12:24:46 +02:00
Frédéric FRANCE
8ed9c30a89
clean tab/whitespace 2020-04-22 09:02:02 +02:00
Laurent Destailleur
35b5ee28ef
Merge pull request #13680 from adrienjacob/patch-3
Add API endpoints for supplier invoice lines
2020-04-22 01:06:57 +02:00
Laurent Destailleur
2541d41809
Merge pull request #13669 from pstructures/new-devlelop
Add default values to extrafields
2020-04-22 01:06:04 +02:00
Laurent Destailleur
292d93405d
Merge pull request #13667 from frederic34/patch-4
Update 11.0.0-12.0.0.sql
2020-04-22 01:04:24 +02:00
Laurent Destailleur
5a42af1e07
Merge pull request #13674 from adrienjacob/patch-2
FIX Delete extra fields for supplier invoice line
2020-04-22 00:59:57 +02:00
Laurent Destailleur
ae519a1009
Update fournisseur.facture.class.php 2020-04-22 00:59:22 +02:00
Laurent Destailleur
735bf4dc2d
Merge pull request #13683 from frederic34/patch-7
Update modMyModule.class.php
2020-04-22 00:57:59 +02:00
Laurent Destailleur
d54c093ae2 Fix file 2020-04-22 00:57:28 +02:00
Laurent Destailleur
60fa3815f8
Merge pull request #13682 from dolibit-ut/patch-26
Update MyGerman.isl
2020-04-22 00:56:52 +02:00
Laurent Destailleur
cea24db829
Merge pull request #13684 from frederic34/patch-8
Update modulebuilder.lang for typo
2020-04-22 00:56:00 +02:00
Laurent Destailleur
f52408cec1 Look and feel v12 2020-04-22 00:55:38 +02:00
Laurent Destailleur
5c573e197b Look and feel v12 2020-04-22 00:50:04 +02:00
Laurent Destailleur
39345a574e
Merge pull request #13681 from frederic34/patch-6
fix phpunit usergroup class
2020-04-22 00:39:18 +02:00
Laurent Destailleur
3e2f0d0156
Merge pull request #13665 from joseplluis/patch-6
FIX type member extrafields are duplicated on edit
2020-04-22 00:37:50 +02:00
Frédéric FRANCE
8f42707220
Update pdf_crabe.modules.php 2020-04-21 23:20:11 +02:00
Frédéric FRANCE
7972a35e36
Update pdf_azur.modules.php 2020-04-21 23:12:12 +02:00
Frédéric FRANCE
2fde77703d
add extrafields in note for enstein 2020-04-21 23:06:41 +02:00
Frédéric FRANCE
14cdf19bf5
Update modulebuilder.lang 2020-04-21 22:57:48 +02:00
Frédéric FRANCE
50ea0ee92a
Update modMyModule.class.php 2020-04-21 22:40:24 +02:00
UT from dolibit
758246c2a9
Update MyGerman.isl 2020-04-21 20:33:41 +02:00
Laurent Destailleur
770fca0b33 Debug the double language feature in pdf 2020-04-21 20:16:36 +02:00
Laurent Destailleur
97b0cabb14 Trans 2020-04-21 18:47:31 +02:00
Laurent Destailleur
042fb4641f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/langs/de_DE/install.lang
	htdocs/langs/de_DE/main.lang
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/cashdesk.lang
	htdocs/langs/fr_FR/errors.lang
	htdocs/langs/fr_FR/projects.lang
2020-04-21 18:33:11 +02:00
Laurent Destailleur
f670a68b04 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/admin/mails.php
2020-04-21 18:29:50 +02:00
Laurent Destailleur
0b790ef327 Sync lang files 2020-04-21 18:18:07 +02:00
Frédéric FRANCE
86e5713233
Update card.php 2020-04-21 16:26:02 +02:00
Frédéric FRANCE
d3c5173c5b
Update usergroup.class.php 2020-04-21 16:14:38 +02:00
stickler-ci
9f4d2ee881 Fixing style errors. 2020-04-21 14:11:33 +00:00
Adrien Jacob
23c2335396
Add API endpoints for supplier invoice lines 2020-04-21 16:07:49 +02:00
Laurent Destailleur
7b99ebfca5 Debug generic translation of fields 2020-04-21 14:54:30 +02:00
Laurent Destailleur
f6735ce8f2 Update repair.sql script 2020-04-21 14:28:52 +02:00
Laurent Destailleur
1ef89eb1a1 Fix $mysoc global not loaded. 2020-04-21 14:14:49 +02:00
Laurent Destailleur
536ab95207 FIX: The "test smtp connectivity" failed on page to setup mass emailing
Conflicts:
	htdocs/admin/mails.php
2020-04-21 12:50:20 +02:00
Laurent Destailleur
f8ae5d9972 Fix Do not show value if null 2020-04-21 12:00:14 +02:00
Laurent Destailleur
ff5bf040e8 FIX text version of html emailing (removed the body style) 2020-04-21 11:19:27 +02:00
stickler-ci
d4a8718e6c Fixing style errors. 2020-04-21 08:00:14 +00:00