lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
96,756 Commits 43 Branches 150 Tags 886 MiB
49faedae6f
Commit Graph

3572 Commits

Author SHA1 Message Date
Laurent Destailleur
2ce76133f4 FIX #16487 2021-02-28 12:59:58 +01:00
Laurent Destailleur
ccffa7e2a0
Merge pull request #16412 from frederic34/compta_codesyntax 
code syntax compta directory
 2021-02-26 10:21:22 +01:00
Laurent Destailleur
d4a78bf7c6 Removed useless field 2021-02-24 10:24:54 +01:00
Frédéric FRANCE
61600a9e65
code syntax compta directory 2021-02-23 21:09:01 +01:00
Laurent Destailleur
2642e1d1b3 Code syntax 2021-02-23 15:35:16 +01:00
Laurent Destailleur
888c072af0 NEW Can set a percentage when creating an invoice from another object 2021-02-23 14:48:54 +01:00
Laurent Destailleur
8c1902be1b Missing space 2021-02-22 18:40:15 +01:00
Laurent Destailleur
1bb27f8f18 Responsive 2021-02-21 13:12:16 +01:00
Laurent Destailleur
71f537e4c1 Responsive 2021-02-19 22:12:03 +01:00
Laurent Destailleur
2be6992916 Fix include_once into include for inc.php file. See comment in #16338 2021-02-19 16:10:19 +01:00
Laurent Destailleur
bfe71e8509 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-17 14:28:19 +01:00
Laurent Destailleur
96a213ced7 Fix escaping html 2021-02-17 11:54:34 +01:00
Laurent Destailleur
dabf9d796a FIX Rename title of template invoice 2021-02-15 22:16:01 +01:00
Laurent Destailleur
44b3221aaf FIX Rename title of template invoice 2021-02-15 22:15:14 +01:00
Laurent Destailleur
be3703a05b Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
 2021-02-15 16:46:55 +01:00
Laurent Destailleur
f0e234c874 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/compta/bank/various_payment/list.php
 2021-02-15 16:45:17 +01:00
Laurent Destailleur
6132843586 FIX Filter on date of next generation on template invoices 2021-02-15 16:43:24 +01:00
Laurent Destailleur
1b129831a9 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-09 14:09:46 +01:00
Laurent Destailleur
48a4ed656b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/expensereport/class/expensereport.class.php
	htdocs/projet/element.php
	htdocs/supplier_proposal/class/supplier_proposal.class.php
 2021-02-09 14:08:49 +01:00
Laurent Destailleur
89bda722bf
Merge pull request #16232 from frederic34/paymentvat 
use camelCaps name
 2021-02-09 13:29:40 +01:00
Frédéric FRANCE
e2d2048522
deprecate non camelCaps functions 2021-02-09 13:25:55 +01:00
Frédéric FRANCE
04c25a01af
deprecate non camelCaps functions 2021-02-09 13:10:11 +01:00
Frédéric FRANCE
f394e55ade
deprecate non camelCaps functions 2021-02-09 10:26:17 +01:00
Frédéric FRANCE
fe9ee5a398
deprecate non camelCaps functions 2021-02-09 09:49:37 +01:00
Frédéric FRANCE
6d961a1f79
deprecate non camelCaps functions 2021-02-09 09:40:07 +01:00
Florian HENRY
dbbebba497 this->errors is set on triggers action must be set by callers 2021-02-08 20:44:40 +01:00
Frédéric FRANCE
898bf55202
Merge remote-tracking branch 'upstream/develop' into facturerec 2021-02-08 20:21:46 +01:00
Frédéric FRANCE
815f3602e3
clean deprecated modelpdf to model_pdf 2021-02-08 18:30:09 +01:00
Laurent Destailleur
8041ef641a
Merge branch 'develop' into dev_typent_jax_workcorrectly 2021-02-08 15:29:36 +01:00
Laurent Destailleur
f0e1c02caa Look and feel v14 - Use placeholder on combolists 2021-02-06 00:05:24 +01:00
Laurent Destailleur
c441b54521 NEW If not logo defined, can use squarred logo on login page 2021-02-05 12:07:39 +01:00
Laurent Destailleur
54be4f282b Fix bad function name 2021-02-05 10:56:33 +01:00
Laurent Destailleur
445e7a1e0c Clean code 2021-02-04 10:58:07 +01:00
stickler-ci
149d2a1d55 Fixing style errors. 2021-02-04 08:52:16 +00:00
Florian HENRY
ec41bf58e5 always ajax now 2021-02-04 09:48:17 +01:00
Florian HENRY
2d77787bba Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_typent_jax_workcorrectly 2021-02-04 09:06:36 +01:00
Florian HENRY
86e9398b79 no inner join 2021-02-04 09:05:58 +01:00
Laurent Destailleur
f301635681 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formmail.class.php
 2021-02-03 21:02:32 +01:00
Laurent Destailleur
9ac2dc1a6e Fix phpcs 2021-02-03 20:42:30 +01:00
Laurent Destailleur
348fd0fcb5 FIX #16160 2021-02-03 19:36:10 +01:00
Laurent Destailleur
2e7de1d137 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/card.php
	test/phpunit/ExportTest.php
 2021-02-02 16:17:53 +01:00
Laurent Destailleur
c5201b95bb FIX Must not be able to edit vat of all lines if not draft 2021-02-02 16:12:03 +01:00
Laurent Destailleur
2e9656a5b2 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formactions.class.php
	htdocs/filefunc.inc.php
 2021-02-02 03:26:20 +01:00
Laurent Destailleur
daf88944f8 FIX #16118 Timezone problem on some fields 2021-02-02 00:19:41 +01:00
Laurent Destailleur
b349290cd1 Fix test for date in future 2021-01-31 12:57:54 +01:00
Laurent Destailleur
7887d4cc8e Fix price2num on all GETPOST('remise_percent') 2021-01-31 12:48:40 +01:00
Laurent Destailleur
b24aac1e6b Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/commande/list.php
 2021-01-31 12:03:39 +01:00
Laurent Destailleur
044b4eee48 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/expedition/list.php
 2021-01-31 11:54:45 +01:00
Laurent Destailleur
244ee05a9c FIX #14290 #15900 2021-01-30 18:09:13 +01:00
Laurent Destailleur
9ec5ba46fb Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/functions.lib.php
 2021-01-28 14:47:06 +01:00
Laurent Destailleur
f462e353e9 FIX #16079 2021-01-28 09:59:13 +01:00
Laurent Destailleur
62a5c8b6da FIX Bad balance of begin commit 2021-01-15 15:34:24 +01:00
Laurent Destailleur
8e1128ef10 FIX Bad balance of begin commit 2021-01-15 15:33:12 +01:00
Laurent Destailleur
828f1c8314 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/card.php
 2021-01-15 14:04:22 +01:00
Laurent Destailleur
cac7fdd058 Look and feel v13 2021-01-15 14:02:18 +01:00
Laurent Destailleur
e5126885fb Fix css 2021-01-15 13:27:45 +01:00
Laurent Destailleur
3e85aec9a5 Fix url 2021-01-15 13:24:37 +01:00
Laurent Destailleur
d7a776ad8a Fix url 2021-01-15 13:23:59 +01:00
Laurent Destailleur
e3a1cabd87
Merge pull request #15942 from bb2a/add_alias_on_lists 
NEW Add column "alias" of company in list of proposal, order, invoice
 2021-01-11 15:56:22 +01:00
Laurent Destailleur
e2598f5af3 NEW Add check to avoid invoice date in future 2021-01-11 15:34:25 +01:00
Laurent Destailleur
0c34543145 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-11 15:20:15 +01:00
Laurent Destailleur
d859072202 Fix GETPOST 2021-01-11 15:19:47 +01:00
Laurent Destailleur
4a919a8c6a Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-11 15:16:33 +01:00
Laurent Destailleur
25a703526e Fix GETPOST 2021-01-11 15:16:01 +01:00
Laurent Destailleur
5bd59cd6d1 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-11 13:37:59 +01:00
Laurent Destailleur
8debb58f7c Fix rounding of currency unit prices 2021-01-11 13:36:53 +01:00
Laurent Destailleur
16253a79ee FIX GETPOST of qty with wrong parameters 
Conflicts:
	htdocs/bom/bom_card.php
 2021-01-11 13:11:40 +01:00
Laurent Destailleur
f3e28c2dd0 FIX GETPOST of qty with wrong parameters 2021-01-11 13:00:29 +01:00
Anthony Berton
59ea907b18 Update list.php 2021-01-10 22:47:30 +01:00
Florian HENRY
dfaf77b03f merge develop 2021-01-03 15:14:34 +01:00
Laurent Destailleur
150b338764 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-02 17:02:08 +01:00
Laurent Destailleur
7b3ed7301d Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/compta/facture/class/facture-rec.class.php
	htdocs/fichinter/class/fichinterrec.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/supplier_proposal/class/supplier_proposal.class.php
 2021-01-02 17:01:03 +01:00
Laurent Destailleur
fd4dab495f FIX Bad cleaning of VAT rate when numbers are into code 2021-01-02 16:51:34 +01:00
Laurent Destailleur
1ab459e854 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-02 16:19:08 +01:00
Laurent Destailleur
ce0abd17fe Debug v13 2021-01-02 16:18:16 +01:00
Laurent Destailleur
020caf8809 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-12-30 23:52:36 +01:00
Laurent Destailleur
60d1b08f84 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/compta/paiement/class/paiement.class.php
	htdocs/takepos/invoice.php
 2020-12-30 22:58:40 +01:00
Laurent Destailleur
65edc377c3 FIX Visible date of payment 2020-12-30 22:53:21 +01:00
lvessiller
d4a19e5968 NEW add total margin in invoice list 2020-12-28 16:20:59 +01:00
Laurent Destailleur
a6eb14f68b
Merge pull request #15585 from cfoellmann/fckeditor-notes 
NEW Can toggle FCKeditor on public/private notes
 2020-12-27 15:06:35 +01:00
Laurent Destailleur
b66ec5bc64 Fix css 2020-12-23 23:16:27 +01:00
Laurent Destailleur
d65dc85a10 FIX for php 8 2020-12-23 19:16:25 +01:00
Laurent Destailleur
bac2ae0d5f Fix warnings 2020-12-22 17:33:17 +01:00
Laurent Destailleur
4ed14d4903 Fix title not saved 2020-12-19 18:52:05 +01:00
Laurent Destailleur
832db82fce Fix warnings 2020-12-18 14:40:45 +01:00
Laurent Destailleur
3b8947dadd Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/core/class/html.form.class.php
	htdocs/product/price.php
 2020-12-17 21:50:05 +01:00
Laurent Destailleur
2c7d872320 Fix warning 2020-12-16 11:07:34 +01:00
Laurent Destailleur
bf01ad8790 Fix warning 2020-12-16 10:55:33 +01:00
atm-lena
cb2c1f3ece FIX Facture Situation Out : status condition 2020-12-16 10:54:32 +01:00
Laurent Destailleur
b991badb8c Fix warning 2020-12-14 13:03:43 +01:00
Laurent Destailleur
3d33d3aa3a Fix warning 2020-12-13 14:36:00 +01:00
Laurent Destailleur
d9ba821411
Merge pull request #15669 from frederic34/template 
typo ortho
 2020-12-07 22:35:45 +01:00
Laurent Destailleur
efc3bad7c6
Merge pull request #15678 from frederic34/fk_element 
doxygen
 2020-12-07 22:31:08 +01:00
Laurent Destailleur
a87ef49172 Fix remove warning 2020-12-06 17:59:49 +01:00
Frédéric FRANCE
4e18f46f28
doxygen 2020-12-05 23:53:55 +01:00
Frédéric FRANCE
d1204e5e9b
typo ortho 2020-12-05 15:35:52 +01:00
Laurent Destailleur
0db72852fb Fix height of graph 2020-12-03 20:18:37 +01:00
Laurent Destailleur
d8d825f615 FIX #15519 2020-12-03 14:40:14 +01:00
Laurent Destailleur
9e18997e64 FIX #15595 2020-12-02 16:35:43 +01:00
Scrutinizer Auto-Fixer
6df4954b20 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-12-01 01:41:19 +00:00