Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-22 09:21:30 +01:00
Code Issues Packages Projects Releases Wiki Activity
94,477 Commits 36 Branches 190 Tags
026e4548258febf35c66351c8ff7cb1556db84e7
Commit Graph

10572 Commits

Author SHA1 Message Date
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
aec5200a98 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/variants/class/ProductCombination.class.php
 2020-05-23 15:37:00 +02:00
Tobias Sekan
58e32aa2ff Fix not wokring default values for date (re...) 2020-05-23 14:22:30 +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
53080be245 fix not working default values for payment 2020-05-22 08:01:29 +02:00
Frédéric FRANCE
b41ac00b98 add new rule 2020-05-21 15:05:19 +02:00
Tobias Sekan
2efe3d7da0 Fix not wokring default values for date (re...) 2020-05-21 09:31:06 +02:00
Frédéric FRANCE
f5688b2eec add new rule 2020-05-21 01:52:25 +02:00
Laurent Destailleur
346082b153 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-19 19:59:24 +02:00
gauthier
f3582d891a FIX : We must only rename current bank receipt 2020-05-19 15:35:37 +02:00
Laurent Destailleur
3e187f8ce0 Fix add check on size limit 2020-05-19 03:36:29 +02:00
Laurent Destailleur
88c40633d5 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-18 15:57:29 +02:00
Laurent Destailleur
ff8d22a80d Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/expedition/class/expedition.class.php
	scripts/cron/cron_run_jobs.php
 2020-05-18 15:57:01 +02:00
Laurent Destailleur
9336828710 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/comm/action/class/actioncomm.class.php
	htdocs/compta/paiement/card.php
	htdocs/expedition/class/expedition.class.php
 2020-05-18 15:54:39 +02:00
ptibogxiv
a9d1519f96 FIX php error if multicompany disabled 2020-05-18 14:52:33 +02:00
Laurent Destailleur
bd564486ff Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-17 20:03:09 +02:00
Laurent Destailleur
106fe7bde6 Clean conflict between direct debit and direct credit orders. 2020-05-17 15:06:09 +02:00
Laurent Destailleur
af46108cc4 Look and feel v12 2020-05-17 13:34:16 +02:00
Laurent Destailleur
5933aba38c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-15 14:12:04 +02:00
Laurent Destailleur
0f403ba9ea Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-15 14:11:13 +02:00
Scrutinizer Auto-Fixer
9699ee7263 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-05-15 11:55:31 +00:00
Laurent Destailleur
91f87d6834 Fix bad param of getNomUrl 2020-05-15 13:52:35 +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
ab07330668 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-05-14 16:34:45 +02:00
Laurent Destailleur
92b245ae93 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/compta/facture/card.php
 2020-05-14 16:34:24 +02:00
DEMAREST Maxime (Indelog)
ac0b735131 Fix use date_ech for social contributions in accounting-file.php 2020-05-13 18:01:00 +02:00
DEMAREST Maxime (Indelog)
ee6e717f46 Add payment loan in accounting-files.php 2020-05-13 17:47:30 +02:00
DEMAREST Maxime (Indelog)
872518a91f Add total by credit/debit for accounting-file.php 2020-05-13 16:54:53 +02:00
DEMAREST Maxime (Indelog)
5f400d27b4 Add preview file in compta/accounting-files.php 2020-05-13 15:01:32 +02:00
DEMAREST Maxime (Indelog)
fcb3b112d9 Fix use datep field for various payment in accouting-files.php 2020-05-13 09:31:14 +02:00
stickler-ci
b7ae5ffa1d Fixing style errors. 2020-05-13 06:12:45 +00:00
DEMAREST Maxime (Indelog)
0850570e95 Fix and imporve some points for compta/accounting-flles.php 
* Fix zip generation for accouning-files if line has no document.
  The zip file generated if $filesarray contain a line with empty 'files'
  was unsustainable because it try to add empty files.

* Add clickable link to jump on card for other line than Invoice and
  Supplier Invoice

* Add various payment

* Use label as ref for paiements of salaries line to display more explicit line
 2020-05-13 08:00:06 +02:00
Laurent Destailleur
b5f3be4599 Clean phpcs rule file 2020-05-13 00:29:46 +02:00
gauthier
fc2f2c6da7 FIX : wrong url param 2020-05-12 17:41:21 +02:00
Laurent Destailleur
e4611f2950 Fix filter on categories 2020-05-12 03:36:33 +02:00
Laurent Destailleur
ed68b73ef5 Merge pull request #13821 from atm-quentin/NEW_invoice_stat_graph_and_categ_search 
NEW Add invoice stat graph and categ search
 2020-05-12 03:31:09 +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
Laurent Destailleur
f23451e1c9 Update facture.class.php 2020-05-07 23:04:52 +02:00
stickler-ci
7514a625fd Fixing style errors. 2020-05-07 20:11:59 +00:00
Vaadasch
db8596743c Update facture.class.php 
Auto-update dates (if not empty) of services when cloning facture.

Actual code is only for month by month.

If empty (start or end) => do nothing

If set, update for next month if there is only 1d between what had been set and the start (or end) of the month.
If there is more than one day from start or end of the month => do nothing, because we're not sure the service is by month

Worst case scenario : the facture is cloned, the service is updated with new unwanted dates
User need to manually updates date : he would have done that either way
 2020-05-07 22:09:55 +02:00
Laurent Destailleur
03fddd48af Clean some constructors 2020-05-07 12:14:45 +02:00
Laurent Destailleur
6c8d302dd9 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/prelevement/list.php
	htdocs/compta/prelevement/rejets.php
	htdocs/fourn/commande/index.php
 2020-05-07 12:03:49 +02:00
Laurent Destailleur
d6887f3ca4 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/compta/prelevement/bons.php
	htdocs/compta/prelevement/list.php
	htdocs/core/class/notify.class.php
 2020-05-07 11:59:13 +02:00
DEMAREST Maxime (Indelog)
7bf037ab2f Fix blank line at end of control structure 2020-05-06 13:46:24 +02:00
DEMAREST Maxime (Indelog)
bf8cd51a5a Fix somes code formating errors 2020-05-06 13:37:24 +02:00
DEMAREST Maxime (Indelog)
128ec6fd78 Add include various payments and loans in accounting report 
For simplified accouning, behaviour not enable by default and must be
  enabed in simplified accounting module admin page (or by global
  settings ACCOUNTING_REPORTS_INCLUDE_VARPAY and
  ACCOUNTING_REPORTS_INCLUDE_LOAN).
 2020-05-06 12:58:41 +02:00
Tobias Sekan
3de77cff3f fix lint errors 2020-05-06 12:11:54 +02:00