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

4600 Commits

Author SHA1 Message Date
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
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
714d01bdab
Merge branch 'develop' into CleanupUserRightsForunFactureCard 2020-05-26 00:25:38 +02:00
Frédéric FRANCE
e5402988d9
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword 2020-05-24 17:58:18 +02:00
Laurent Destailleur
fd61214b97 Merge 2020-05-24 01:06:45 +02:00
Laurent Destailleur
6056ed2755 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/holiday/class/holiday.class.php
	htdocs/index.php
 2020-05-24 01:02:08 +02:00
Frédéric FRANCE
174ddc5fd4
prepare new rule 2020-05-23 21:07:47 +02:00
Laurent Destailleur
7bfbf3c88b Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/holiday/class/holiday.class.php
	htdocs/index.php
 2020-05-23 20:20:53 +02:00
Laurent Destailleur
45ddde6940 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/expensereport/class/expensereport.class.php
	htdocs/holiday/class/holiday.class.php
	htdocs/index.php
 2020-05-23 20:18:10 +02:00
Laurent Destailleur
40777cbcd9 Fix phpcs 2020-05-23 20:11:10 +02:00
Laurent Destailleur
127534ef55 Fix common var name seems to be $objref for subdir of doc 2020-05-23 20:09:31 +02:00
stickler-ci
66637ba0b6 Fixing style errors. 2020-05-23 16:39:06 +00:00
Frédéric FRANCE
2085ac73e7
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword 2020-05-23 18:34:58 +02:00
Laurent Destailleur
7d8323b0a7
Merge pull request #13920 from altatof/dispatch 
NEW : edit or delete dispatched lines
 2020-05-23 14:56:04 +02:00
Tobias Sekan
babcdfc99a Fix not working default value (re...) 2020-05-23 14:22:40 +02:00
Laurent Destailleur
7463eb2bd0
Merge pull request #13938 from TobiasSekan/FixDefaultDateValuesForInvoice 
FIX not working default date values for new invoices
 2020-05-23 14:21:50 +02:00
Laurent Destailleur
b4fa56d07e
Merge pull request #13947 from TobiasSekan/FixDefaultValuesForPaymentOnInvoices 
FIX not working default values for payment on new invoices
 2020-05-23 13:33:01 +02:00
stickler-ci
2873f4dacf Fixing style errors. 2020-05-22 06:08:12 +00:00
Tobias Sekan
d9a2d2b982
fix not working default values for payment 2020-05-22 08:00:26 +02:00
Frédéric FRANCE
b41ac00b98
add new rule 2020-05-21 15:05:19 +02:00
Tobias Sekan
44ffb8dbf7
Fix not working default value (re...) 2020-05-21 09:34:20 +02:00
Frédéric FRANCE
f5688b2eec
add new rule 2020-05-21 01:52:25 +02:00
altairis
55def0248c fix missing rollbacks 2020-05-20 14:37:35 +02:00
Laurent Destailleur
2f7786f50f Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-20 10:37:43 +02:00
Laurent Destailleur
c5e341883d Fix popup of supplier invoice 2020-05-19 23:22:40 +02:00
altairis
80c56b3017 manage stock on edit and delete dispatched lines 2020-05-19 15:59:03 +02:00
altairis
b79a30c0f9 edit and delete dispatched lines 2020-05-19 14:18:06 +02:00
Laurent Destailleur
a865dc7232
Merge pull request #13762 from indelog/rappaygroupmod 
NEW possibilty to group payments by mode and show their subtotal
 2020-05-14 16:55:37 +02:00
Laurent Destailleur
4584fa1aa6 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/asset/list.php
	htdocs/compta/bank/list.php
	htdocs/contrat/services_list.php
	htdocs/core/lib/date.lib.php
	htdocs/expensereport/list.php
	htdocs/fichinter/list.php
	htdocs/holiday/list.php
	htdocs/projet/tasks/list.php
	htdocs/supplier_proposal/list.php
	htdocs/user/list.php
 2020-05-11 19:43:06 +02:00
Maxime Kohlhaas
1a9afe6b20 Fix missing hook params for printFieldListValue 2020-05-08 01:40:25 +02:00
Tobias Sekan
3f5f6b3243
Fix lint errors 2020-05-06 12:09:39 +02:00
Tobias Sekan
468829aa70
Add new vendor invoice area page 2020-05-06 11:48:01 +02:00
Pierre Ardoin
c0b9fef229
Fix issue in status name 
Before : $commandestatic->LibStatut($obj->nb) shows bad value because bad param

Now : $commandestatic->LibStatut($obj->fk_statut) shows good value.
 2020-05-05 08:40:30 +02:00
Scrutinizer Auto-Fixer
8f0e00b4aa Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-05-02 01:39:56 +00:00
DEMAREST Maxime (Indelog)
740b2c9228 NEW possibilty to group payments by mode and show their subtotal 
This add two params (PAYMENTS_REPORT_GROUP_BY_MOD and
PAYMENTS_FOURN_REPORT_GROUP_BY_MOD) for payments and supplier payments
to group them by mode and get subtotals for each mode. Add the
corresponding configuration options on admin page fore each payments and
supplier payments.
 2020-04-28 09:01:00 +02:00
Laurent Destailleur
1c70e49695
Merge branch 'develop' into 12.0_a23 2020-04-27 14:14:13 +02:00
Laurent Destailleur
31157931a9 Fix phpcs 2020-04-26 23:52:23 +02:00
Scrutinizer Auto-Fixer
1bf5745286 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-04-25 11:52:07 +00:00
Laurent Destailleur
1121d2c1c6 Look and feel v12 2020-04-25 13:49:44 +02:00
Laurent Destailleur
6b114a31ce Look and feel v12 2020-04-25 03:00:41 +02:00
Laurent Destailleur
291664d109 Look and feel v12 2020-04-25 01:04:26 +02:00
Laurent Destailleur
3ed11f374a Look and feel v12 2020-04-24 23:56:57 +02:00
Laurent Destailleur
d416edab1a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-04-24 22:50:09 +02:00
Laurent Destailleur
54d641020f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/accounting-files.php
 2020-04-24 22:49:59 +02:00
Laurent Destailleur
d11dcc35c3 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/core/class/commonobject.class.php
 2020-04-24 19:56:19 +02:00
Laurent Destailleur
6798e9e6f5 Fix remove warning missing the seller in update_price 2020-04-24 19:52:54 +02:00
Laurent Destailleur
e84601f5ed
Merge pull request #13710 from TobiasSekan/FixMissingErrorOnCloneObject 
FIX not shown error on clone vendor invoice with ExtraFields
 2020-04-24 19:01:42 +02:00
Laurent Destailleur
7bbfd2175d Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fourn/class/fournisseur.commande.dispatch.class.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/reception/class/reception.class.php
 2020-04-24 18:58:47 +02:00
Laurent Destailleur
9764af7e9c
Merge pull request #13731 from simicar29/11.0-reception 
Clean line extrafields when deleting reception
 2020-04-24 15:16:51 +02:00