lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
76,301 Commits 43 Branches 150 Tags 886 MiB
21f6daae2a
Commit Graph

8935 Commits

Author SHA1 Message Date
Christophe Battarel
46e398f3d3 NEW : retrieve invoice infos from order when billing shipment 2019-04-10 10:50:01 +02:00
Christophe Battarel
b04296984d NEW constant KEEP_DISCOUNT_LINES_FROM_ORIGIN 2019-04-10 10:29:17 +02:00
Christophe Battarel
5f9f615e11 fix form_conditions_reglement parameters 2019-04-09 18:37:36 +02:00
Christophe Battarel
790c5f493a fix select_conditions parameters 2019-04-09 18:32:00 +02:00
Christophe Battarel
01255602d8 fix select_conditions parameters 2019-04-09 18:30:58 +02:00
Christophe Battarel
5382ad207f NEW : add payment terms to invoices list 2019-04-09 18:26:00 +02:00
Laurent Destailleur
d7f980fda0 NEW Add picto of deletion on mass action combo lists 2019-04-09 01:22:59 +02:00
Laurent Destailleur
7b01e76d2b Fix doxygen 2019-04-08 16:04:15 +02:00
Laurent Destailleur
1274d71a10 Fix phpcs 2019-04-08 16:00:01 +02:00
Laurent Destailleur
2047ad62c5
Merge pull request #10979 from fpeyraud/develop 
Fix redirection on social tax deletion
 2019-04-08 13:58:07 +02:00
Florent Peyraud
7672fd7cf0 Fix redirection on social tax deletion 2019-04-08 09:05:51 +02:00
Dan Rusu
4597e78a9d Re synchronized the UI action button "Mark as credit available" with API 
At some point we will need to move this code into common location (maybe facture.class.php) and call as function from both places
 2019-04-06 20:10:11 +03:00
Laurent Destailleur
bb9cd05ea8 Fix phpcs 2019-04-02 20:02:43 +02:00
Laurent Destailleur
42fda54edf Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/bank/card.php
	htdocs/fichinter/list.php
	htdocs/product/stock/replenish.php
 2019-04-02 19:41:58 +02:00
Laurent Destailleur
c5348be337 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-04-02 19:35:42 +02:00
Laurent Destailleur
17a61b3232 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-04-02 19:34:49 +02:00
Laurent Destailleur
37b8796f3c NEW Add line total on list of payments 2019-04-02 17:54:34 +02:00
Laurent Destailleur
8fe1be1a67 Removed deprecated use of string in dol_print_date(). Only date allowed. 2019-04-01 19:27:34 +02:00
Laurent Destailleur
143cbba09b
Update card.php 2019-03-31 18:49:38 +02:00
Laurent Destailleur
ec9fdc1321 Fix regression with class="right". Style of amount lost. 2019-03-31 11:25:29 +02:00
Alexandre SPANGARO
5588fe5b81 FIX: Don't show journal:getNomUrl without data 
ErrorBadValueForParamNotAString
 2019-03-30 09:42:13 +01:00
Laurent Destailleur
5e23c4c03c Fix self: not defined in a page 2019-03-29 16:23:55 +01:00
Laurent Destailleur
1b2826f476 Look and feel v10 2019-03-29 13:26:26 +01:00
Laurent Destailleur
11e4411400 TakePOS Can enter payment in several times and with different modes 2019-03-27 15:42:53 +01:00
Laurent Destailleur
a34f4c2806
Merge pull request #10909 from IonAgorria/fix-line-dates 
FIX: Disallow line start date after end date
 2019-03-26 19:43:11 +01:00
Laurent Destailleur
f27f65e8bf Responsive 2019-03-25 10:09:02 +01:00
Laurent Destailleur
1409d1a2c8 Fix phpcs 2019-03-24 19:52:48 +01:00
Laurent Destailleur
89b7f1a040 Fix phpcs 2019-03-24 19:52:18 +01:00
Laurent Destailleur
3578c7cb0a Fix phpcs 2019-03-24 18:20:56 +01:00
Laurent Destailleur
364deb1476 Fix phpcs 2019-03-24 16:09:48 +01:00
Laurent Destailleur
28abf5663b Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/tva/clients.php
 2019-03-24 15:06:16 +01:00
Laurent Destailleur
2034ac61ef Fix phpcs 2019-03-24 15:05:02 +01:00
Ion
7bfa49b29c FIX: Disallow line start date > end date 2019-03-24 14:30:00 +01:00
Laurent Destailleur
20f3af066c Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/tva/clients.php
 2019-03-23 22:44:14 +01:00
Laurent Destailleur
79ed4bc80b Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/core/actions_massactions.inc.php
 2019-03-23 22:36:04 +01:00
Laurent Destailleur
28fede950f Hidden option CHANGE_ORDER_CONCAT_DESCRIPTION were renamed into 
MAIN_CHANGE_ORDER_CONCAT_DESCRIPTION
 2019-03-22 13:00:48 +01:00
Laurent Destailleur
a7181750c6
Merge pull request #10879 from altatof/noconcatdesc 
NEW : add constant NO_CONCAT_DESCRIPTION
 2019-03-22 12:56:46 +01:00
Laurent Destailleur
37cc5b7d35
Merge pull request #10901 from fmarcet/8.0 
FIX: The minimum amount filter does not work in VAT report by customer
 2019-03-22 12:27:30 +01:00
Ferran Marcet
f37c1b9287 FIX: The minimum amount filter does not work in the VAT report per customer 2019-03-22 09:28:50 +01:00
Laurent Destailleur
48a0c447b4 Fix test on draft status regression 2019-03-21 21:00:06 +01:00
Laurent Destailleur
ee4150665e Fix phpcs 2019-03-21 20:15:19 +01:00
Laurent Destailleur
5693fbfe97
Merge pull request #10898 from grandoc/new_branch_21_03_2019 
add some comments
 2019-03-21 18:29:11 +01:00
Laurent Destailleur
47eb256b82 Fix phpcs 2019-03-21 18:22:17 +01:00
Laurent Destailleur
930720decd WIP Start to replace use of property ->brouillon 2019-03-21 18:13:51 +01:00
Laurent Destailleur
90df30e412 NEW Add trigget FICHINTER_UNVALIDATE 
Standardize code of setDraft.
 2019-03-21 17:37:56 +01:00
Philippe GRAND
cb59f52a55 add some comments 2019-03-21 15:01:09 +01:00
Philippe GRAND
86c3b1a5b0 add some comments 2019-03-21 14:59:21 +01:00
Laurent Destailleur
5d21547854 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/extrafields.class.php
	htdocs/product/price.php
	htdocs/user/perms.php
 2019-03-21 12:20:24 +01:00
Frédéric FRANCE
89e8889c5c
phpcs fix v9 2019-03-19 16:33:34 +01:00
Laurent Destailleur
eab11ce743 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
 2019-03-19 13:14:44 +01:00
Laurent Destailleur
dbe15d3685 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-03-19 13:10:17 +01:00
Laurent Destailleur
b11403103b Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-03-19 13:09:48 +01:00
Laurent Destailleur
8664594fc8 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-03-19 13:09:39 +01:00
Laurent Destailleur
eaaea2c2f9 Fix set of due date when invoice created from API 2019-03-19 12:08:55 +01:00
Laurent Destailleur
bca10084c5
Merge pull request #10882 from alexandreaj/patch-1 
Update api_invoices.class.php
 2019-03-19 12:07:16 +01:00
Laurent Destailleur
70cb042e58
Update api_invoices.class.php 2019-03-19 12:06:57 +01:00
Laurent Destailleur
b10690ce88
Merge pull request #10874 from grandoc/translation 
translation
 2019-03-19 11:14:40 +01:00
Laurent Destailleur
6bead00260 Better text 2019-03-19 10:27:36 +01:00
Laurent Destailleur
3f62098b81 Add hours in date 2019-03-19 10:14:13 +01:00
alexandreaj
9bb1ede65a
Update api_invoices.class.php 
Adding possibility to set due date (date_lim_reglement field in mysql) via the API.
 2019-03-18 21:11:13 +01:00
Laurent Destailleur
41c737a213 Fix, Oops, test was inverted 2019-03-18 20:16:19 +01:00
Laurent Destailleur
aa013ff753 Fix do we really must copy notes when creating an object from another 
source object? Add a hack with hidden option to be able to change this.
 2019-03-18 20:09:09 +01:00
Christophe Battarel
8b3fd2eacf NEW : add constant NO_CONCAT_DESCRIPTION 2019-03-18 16:10:17 +01:00
Philippe GRAND
c13a1dbc63 translation 2019-03-18 13:45:24 +01:00
Philippe GRAND
0f03b16313 translation 2019-03-18 12:46:32 +01:00
Laurent Destailleur
89087c6847
Merge pull request #10800 from atm-quentin/FIX_wrong_vat_deposit_invoice 
Wrong vat if deposit from propal with multiple vat
 2019-03-18 11:14:11 +01:00
Regis Houssin
57091f08b0 FIX missing entity filter and wrong var name 2019-03-18 10:53:43 +01:00
Laurent Destailleur
f3cf3482fa Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/paiement/class/paiement.class.php
	htdocs/projet/element.php
 2019-03-18 10:23:14 +01:00
Laurent Destailleur
34034787af FIX problem with sign of various payment in project preview 2019-03-18 10:16:08 +01:00
Laurent Destailleur
1abfd1f58e Add page to setup module debugbar 
Fix CSS
 2019-03-17 00:32:39 +01:00
Laurent Destailleur
7cdfff7263 Fix syntax error 2019-03-15 20:42:49 +01:00
Laurent Destailleur
875b5b6a8d Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/expensereport/card.php
	htdocs/projet/card.php
	htdocs/public/opensurvey/studs.php
 2019-03-15 19:20:22 +01:00
Laurent Destailleur
39e24d30aa Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-03-15 19:18:30 +01:00
Laurent Destailleur
681d626284 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-03-15 19:17:31 +01:00
Laurent Destailleur
b33c366b02
Update card.php 2019-03-15 19:16:49 +01:00
Laurent Destailleur
c0b6699b25 All methods set_draft() were renamed into setDraft() 2019-03-15 19:01:40 +01:00
Laurent Destailleur
a2d6723ff3 WIP Link files to expense report lines 2019-03-15 15:07:52 +01:00
Laurent Destailleur
bcf0dd0168
Merge branch 'develop' into patch-5 2019-03-14 16:47:08 +01:00
Laurent Destailleur
cdf6e4b65a Fix some PSR rules 2019-03-14 16:43:27 +01:00
Frédéric FRANCE
321a919fb1
Update result.php 2019-03-14 16:42:35 +01:00
florian HENRY
9bcb91a122 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2019-03-14 13:02:09 +01:00
gauthier
a524bbc5c6 FIX : when we create deposit with multi tva, we mustn't add line if amount = 0 (example when we have a 100% reduc on one of origin invoice line) 2019-03-13 15:59:41 +01:00
Laurent Destailleur
eeafc3c630 Standardize translation of amount 2019-03-13 14:10:36 +01:00
Laurent Destailleur
98ca9bf17a Reduce quantity of string to translates 2019-03-12 19:44:59 +01:00
florian HENRY
9968fae9dc Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2019-03-12 17:25:00 +01:00
Joan Louis
17647de4cc Fix extrafields calls from cards for Dolibarr 8 See #10803 2019-03-12 11:24:54 +01:00
Joan Louis
f326c75be7 Update call to extrafields from cards 2019-03-11 21:34:16 +01:00
florian HENRY
53a76e91b4 fix missing test on method result 2019-03-11 21:25:51 +01:00
Joan Louis
ee5753819e Update call to extrafields from cards 2019-03-11 14:22:04 +01:00
atm-quentin
ab781c32c7 Wrong vat if deposit from propal with multiple vat 2019-03-11 11:28:25 +01:00
Laurent Destailleur
f3ca69522e Fix phpcs 2019-03-11 01:41:09 +01:00
Alexandre SPANGARO
ad485b55b6 NEW: Add category to bank transaction in various payment 2019-03-10 20:01:39 +01:00
Laurent Destailleur
9a5497b940
Merge pull request #10776 from frederic34/patch-3 
do not trim int
 2019-03-08 19:38:44 +01:00
Frédéric FRANCE
3dd4f0bfff
do not trim int 2019-03-07 22:17:48 +01:00
Frédéric FRANCE
d96cc53f97
replace html by html5 in fourn 2019-03-07 20:46:38 +01:00
Laurent Destailleur
1fb86e12e5 Merge manually some enhancement from #10507 2019-03-07 13:02:51 +01:00
Laurent Destailleur
a426c8e9bf Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/system/filecheck.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/filefunc.inc.php
	htdocs/install/upgrade2.php
	htdocs/product/class/product.class.php
 2019-03-07 11:16:24 +01:00
Laurent Destailleur
b15e00cae7 FIX Autodetect buy price for invoices autogenerated with templates. 2019-03-06 21:39:09 +01:00
Frédéric FRANCE
f283782445
change visibility 2019-03-04 19:57:46 +01:00
Laurent Destailleur
63d14b16c9 FIX The notes was also copied on invoice 2019-03-04 14:56:39 +01:00
Laurent Destailleur
db13e54724 FIX The notes was also copied on invoice 2019-03-04 14:54:59 +01:00
Laurent Destailleur
1686b7b1db FIX label of bank account 2019-03-04 14:42:00 +01:00
Laurent Destailleur
fe5cb57df8 FIX label of bank account 2019-03-04 14:41:20 +01:00
Laurent Destailleur
4cb5c9ef35 Var not initialized 2019-03-02 19:26:01 +01:00
Laurent Destailleur
a5711a51ab Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/core/lib/json.lib.php
	test/phpunit/JsonLibTest.php
 2019-03-02 18:30:17 +01:00
Laurent Destailleur
4f9981063f Merge branch 'Squiz.Scope.MethodScope.Missing' of https://github.com/frederic34/dolibarr into frederic34-Squiz.Scope.MethodScope.Missing 2019-03-02 18:26:50 +01:00
Laurent Destailleur
50f6bbefe7
Merge pull request #10720 from frederic34/patch-5 
Update facture-rec.class.php
 2019-03-02 18:23:26 +01:00
Laurent Destailleur
56d921ea52 CSS 2019-03-02 12:57:07 +01:00
Frédéric FRANCE
728a3fcbba
Update facture-rec.class.php 2019-03-02 08:43:09 +01:00
Frédéric FRANCE
4fcde0eaa3
Update facture-rec.class.php 2019-03-02 01:37:49 +01:00
Frédéric FRANCE
62501b11e8
add visibility 2019-03-02 00:14:22 +01:00
Frédéric FRANCE
014f69850e
add visibility 2019-03-01 23:08:57 +01:00
Frédéric FRANCE
be8db31388
Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing 2019-03-01 19:24:27 +01:00
Frédéric FRANCE
bd2e541fd6
add visibility 2019-03-01 18:28:51 +01:00
Laurent Destailleur
2e128a786b NEW Can change the customer account of an instance 2019-03-01 15:38:15 +01:00
Frédéric FRANCE
796ea6f4ea
add visibility 2019-02-28 23:19:58 +01:00
Laurent Destailleur
b3fb0eaf5b
Merge branch 'develop' into Squiz.Scope.MethodScope.Missing 2019-02-27 15:48:31 +01:00
Laurent Destailleur
2448d1deaa fk_projet -> fk_project 2019-02-27 15:32:18 +01:00
Laurent Destailleur
3bffa69f1d Remove deprecated code 2019-02-27 15:23:56 +01:00
Laurent Destailleur
da826c4bc7 Fix bad var name 2019-02-27 01:22:26 +01:00
Frédéric FRANCE
81f2f99db5
Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing 2019-02-26 21:16:01 +01:00
Laurent Destailleur
3ec2338c2d Look and feel v10 2019-02-26 19:37:32 +01:00
Frédéric FRANCE
346d1f410c
wip 2019-02-25 23:15:48 +01:00
Laurent Destailleur
8a9339a059 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/compta/facture/class/api_invoices.class.php
 2019-02-25 15:16:23 +01:00
Laurent Destailleur
dde18e803d Fix transaction 2019-02-25 15:09:56 +01:00
Laurent Destailleur
3fa2680859
Merge pull request #10669 from frederic34/html5fix 
replace by html5 in ticket supplier_proposal, stripe, societe
 2019-02-24 20:36:24 +01:00
Laurent Destailleur
3f078203b9 Fix phpcs 2019-02-24 20:29:01 +01:00
Frédéric FRANCE
4f341ea022
replace html code by html5 2019-02-23 22:56:38 +01:00
Frédéric FRANCE
4b0b8e1c1f
Update api_invoices.class.php 2019-02-23 16:44:36 +01:00
Frédéric FRANCE
0e093ffb24
Update api_invoices.class.php 2019-02-23 16:41:40 +01:00
Frédéric FRANCE
f1e4c80771
Update api_invoices.class.php 2019-02-23 16:39:15 +01:00
Laurent Destailleur
f83f746123 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/compta/facture/class/facture.class.php
 2019-02-23 16:03:40 +01:00
Laurent Destailleur
cdf85b0d00 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-02-23 16:02:35 +01:00
ptibogxiv
d7ffcca59b FIX fetch module / pos source 2019-02-23 16:00:07 +01:00
Laurent Destailleur
0298582fc3
Merge pull request #10640 from ptibogxiv/patch-122 
FIX fetch module / pos source
 2019-02-23 15:59:22 +01:00
Laurent Destailleur
9ba6e3f8f5 FIX #10638 2019-02-23 15:57:57 +01:00
Laurent Destailleur
2413c41622
Merge pull request #10639 from ptibogxiv/patch-121 
NEW POS support in order (ex: online cart)
 2019-02-23 15:19:10 +01:00
Laurent Destailleur
b3c3e8f09e
Merge pull request #10547 from Rusu-Marian-Dan/develop 
New API markAsCreditAvailable
 2019-02-23 14:39:13 +01:00
Laurent Destailleur
ca45651265
Update api_invoices.class.php 2019-02-23 14:38:13 +01:00
Laurent Destailleur
eb733728c3
Update api_invoices.class.php 2019-02-23 14:37:09 +01:00
Laurent Destailleur
5bf3a1f175
Update api_invoices.class.php 2019-02-23 14:36:51 +01:00
Laurent Destailleur
3d0af97e79
Update api_invoices.class.php 2019-02-23 14:24:37 +01:00
Cristian Torres
8ca6935f8b [FIX] Variable $i is already declared 
It was preventing displaying of the other accounts
 2019-02-23 14:08:11 +01:00
Laurent Destailleur
59218de7de
Merge pull request #10637 from tony13tv/patch-1 
[FIX] Variable $i is already declared
 2019-02-23 14:07:46 +01:00
ptibogxiv
98affe0921
Update facture.class.php 2019-02-20 14:25:25 +01:00
ptibogxiv
152585c1b8
Update facture.class.php 2019-02-20 13:20:46 +01:00
ptibogxiv
ef5372f476
Update facture.class.php 2019-02-20 13:04:22 +01:00
ptibogxiv
6416f24d5f
FIX fetch module / pos source 2019-02-20 12:35:13 +01:00
ptibogxiv
c0de2b5b07
Update facture.class.php 2019-02-20 12:22:02 +01:00
Laurent Destailleur
4296f959ca Invert option MAIN_HIDE_VERSION into ! MAIN_SHOW_VERSION 
Reorganize levels of menu accountancy
 2019-02-20 04:55:35 +01:00