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

8923 Commits

Author SHA1 Message Date
Laurent Destailleur
74875690a0 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/actions_massactions.inc.php
	htdocs/core/tpl/massactions_pre.tpl.php
 2019-05-08 19:14:31 +02:00
Laurent Destailleur
f6de2d091d FIX Sending email to mass actions send same email on same customer 2019-05-08 19:07:12 +02:00
Laurent Destailleur
1e036f3513 Correct support for type price on module builder 
Fix link of ref in cash fence list
 2019-05-08 01:09:38 +02:00
Francis Appels
03e2983d40 Merge branch 'develop' into clean_10_beta 2019-05-06 15:22:27 +02:00
ptibogxiv
c94e621059
FIX : facnumber to ref report takepos 2019-05-04 17:23:57 +02:00
Laurent Destailleur
64fb7bd1c2
Merge pull request #11103 from grandoc/new_branch_02_05_2019 
inactive a var_dump
 2019-05-03 02:29:25 +02:00
Philippe GRAND
bcd96ba8d6 inactive a var_dump 2019-05-02 14:42:02 +02:00
Laurent Destailleur
4f9ea912ab Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/website.inc.php
 2019-05-02 14:41:56 +02:00
Laurent Destailleur
e2c7c0574e
Merge pull request #11086 from andreubisquerra/master 
NEW Add history to view and print previous sales on TakePos.
 2019-05-02 14:04:57 +02:00
Francis Appels
18c5c586ab Cleanup set_draft in syslog 2019-05-01 09:38:27 +02:00
Laurent Destailleur
9c45b781af Fix balance of colspan 2019-04-30 16:44:11 +02:00
Laurent Destailleur
2136bce4b0 FIX missing situation invoice in list 2019-04-30 15:10:38 +02:00
andreubisquerra
00db274956 Add history to view and print previous sales. 2019-04-28 18:12:33 +02:00
Laurent Destailleur
091132de2f Signatures of methods createFromClone() has been standardized. All 
methods requires the object User as first parameter.
 2019-04-25 12:11:32 +02:00
Alexandre SPANGARO
9210a39f6a Merge branch 'develop' into 10.0_accountancy2 2019-04-24 21:49:41 +02:00
Laurent Destailleur
3b04d2fe9b Fix warnings 2019-04-23 13:21:17 +02:00
Laurent Destailleur
7f4b09c482 Fix warnings 2019-04-23 13:20:44 +02:00
Laurent Destailleur
4d92d7731c Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/sendings.lib.php
	htdocs/langs/en_US/admin.lang
	htdocs/theme/eldy/style.css.php
 2019-04-23 12:32:08 +02:00
Laurent Destailleur
84ec39f043 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-04-23 12:25:53 +02:00
Laurent Destailleur
6da42941a8 NEW Add attached document on bank account visible in automatic ECM. 2019-04-21 19:54:30 +02:00
Laurent Destailleur
74ba9f57f1 Fix phpcs 2019-04-19 18:48:00 +02:00
John BOTELLA
0855d84ccf FIX error messages not displayed 2019-04-18 10:40:34 +02:00
atm-quentin
cb7f9c2b6f NEW filter by thirdparty on report CA by prod/serv 2019-04-17 14:35:46 +02:00
Laurent Destailleur
e6ffaeefe5 CSS 2019-04-17 10:39:30 +02:00
Laurent Destailleur
212b058f46 Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop 2019-04-17 01:18:46 +02:00
Laurent Destailleur
8310e09786 Fix td balance 2019-04-17 01:18:02 +02:00
John BOTELLA
a60d4b3b52 Appli btn apply to links 2019-04-16 09:09:25 +02:00
John BOTELLA
7372e8c610 Appli function to links 2019-04-15 15:47:36 +02:00
Philippe GRAND
728381e6e6 FIX : bug #11018 2019-04-15 15:10:44 +02:00
ATM john
292d9c38a5 Appli function to links 2019-04-15 00:21:58 +02:00
Laurent Destailleur
76567b1d07 NEW Can filter on the date of period for social contributions 2019-04-12 12:51:48 +02:00
Laurent Destailleur
cf058e7d3b NEW Ask date of invoice when using the Clone feature. 2019-04-12 12:12:08 +02:00
ATM john
bc4db54722 add more class 2019-04-11 21:29:01 +02:00
ATM john
3390ba0e77 Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_look_and_feel_title_button 2019-04-11 21:16:42 +02:00
Laurent Destailleur
8079a389f8
Merge pull request #10992 from altatof/faccard2 
NEW : retrieve invoice infos from order when billing shipment
 2019-04-11 16:34:42 +02:00
Laurent Destailleur
f2fd07d824
Merge pull request #10991 from altatof/faccard 
NEW constant KEEP_DISCOUNT_LINES_FROM_ORIGIN
 2019-04-11 16:31:37 +02:00
Laurent Destailleur
4f87018c33
Update card.php 2019-04-11 16:31:13 +02:00
ATM john
29b31bd7ab New title button first step 2019-04-11 00:38:44 +02:00
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