Commit Graph

2926 Commits

Author SHA1 Message Date
Frédéric FRANCE
35751a80ab
100% centpercent 2019-11-05 21:24:41 +01:00
Laurent Destailleur
94bd0f71d9 Fix pb with permission 2019-11-05 19:41:30 +01:00
Laurent Destailleur
17d5c385ff FIX #12320 It is clearer that you can't change thirdparty when creating
invoice from template with a recurring rule.
2019-11-05 15:46:48 +01:00
Laurent Destailleur
ce1dec253f FIX #11364 2019-11-05 12:47:38 +01:00
Frédéric FRANCE
ac783b303d
Update card-rec.php 2019-11-04 20:47:25 +01:00
Laurent Destailleur
e60fff39d9 Fix phpcs 2019-11-04 20:36:55 +01:00
Laurent Destailleur
11500fb8d9 FIX confusion between permto... and permisstionto... 2019-11-04 15:33:49 +01:00
Laurent Destailleur
99a4781a42 Fix better support for multicurrency for template invoices 2019-11-03 18:58:26 +01:00
Laurent Destailleur
630a150b09 Fix multicurrency rate must be visible if currency differs only 2019-11-03 17:48:16 +01:00
Laurent Destailleur
89f1904793 Finish removing of ->attribute_label 2019-11-02 17:26:26 +01:00
Laurent Destailleur
e087ac434d
Merge pull request #12283 from frederic34/socid
replace deprecated user->societe_id by user->socid
2019-11-02 13:34:21 +01:00
Laurent Destailleur
45c77b4560 Renaming some libelle into label 2019-11-02 12:59:38 +01:00
Frédéric FRANCE
dbed10a701
Merge remote-tracking branch 'upstream/develop' into socid 2019-11-01 21:39:20 +01:00
Laurent Destailleur
a1700e71be Fix phpcs 2019-10-31 21:18:38 +01:00
Frédéric FRANCE
e93aaa2a75
replace deprecated user->societe_id by user->socid 2019-10-31 20:46:31 +01:00
Frédéric FRANCE
a1f0245c79
clean indent in compta, contact directory 2019-10-26 18:13:20 +02:00
Alfredo Altamirano
f2e5a23547 Declaration of $soc should not be conditional 2019-10-20 13:47:39 -05:00
Laurent Destailleur
5a4960f7ae Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/filefunc.inc.php
	htdocs/takepos/takepos.php
2019-10-20 15:30:28 +02:00
Frédéric FRANCE
a16b7bcda6
cut long lines 2019-10-19 19:16:28 +02:00
Laurent Destailleur
f85899742b
Merge pull request #12153 from frederic34/Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen
2019-10-17 17:48:42 +02:00
Laurent Destailleur
f7782873a5 Look and feel v11 2019-10-17 15:58:24 +02:00
Laurent Destailleur
c58a006703 NEW Show POS application and terminal on invoice card. 2019-10-17 15:56:50 +02:00
Laurent Destailleur
5e12dcc6b1 Fix on FACTURE_ENABLE_NEGATIVE 2019-10-17 15:40:02 +02:00
Frédéric FRANCE
e75f7d448c
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen 2019-10-16 20:00:01 +02:00
Laurent Destailleur
b9ec45fd49 Clean code 2019-10-16 14:02:13 +02:00
Laurent Destailleur
5d02763288
Merge pull request #12129 from cyrilus/develop
ADD option MAIN_DONT_KEEP_NOTE_ON_CLONING to remove note on cloning
2019-10-14 20:39:08 +02:00
stickler-ci
4b7987374b Fixing style errors. 2019-10-14 14:46:04 +00:00
Laurent Destailleur
dba9450b01 css 2019-10-14 16:03:12 +02:00
Laurent Destailleur
28339920b3 Translation 2019-10-14 16:00:03 +02:00
Laurent Destailleur
323f31d832 Trans frequency 2019-10-13 20:54:00 +02:00
Laurent Destailleur
f91b98d326 Add frequency in template invoice popup 2019-10-13 20:50:03 +02:00
Frédéric FRANCE
9f59656589
fix typo inspired by grandoc 2019-10-11 23:08:33 +02:00
Laurent Destailleur
78bfc8997d Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/link.class.php
2019-10-11 16:14:29 +02:00
Laurent Destailleur
d052e4f323 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/link.class.php
2019-10-11 16:13:26 +02:00
Laurent Destailleur
fc9c343af9 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/core/class/link.class.php
2019-10-11 16:12:01 +02:00
Laurent Destailleur
777c297353 FIX #12054 2019-10-11 15:42:27 +02:00
ro@t.com
2149b155d1 ADD option MAIN_DONT_KEEP_NOTE_ON_CLONING to remove note on cloning 2019-10-10 15:57:26 +02:00
Laurent Destailleur
b34cbfad74 Rename const 2019-10-10 15:23:45 +02:00
Laurent Destailleur
015d51c169 NEW Add column of module source and POS terminal in invoice list. 2019-10-10 15:10:41 +02:00
Laurent Destailleur
b6c600c171 css 2019-10-10 11:44:03 +02:00
Frédéric FRANCE
0c8331b6d7
doxygen 2019-10-09 18:47:25 +02:00
Laurent Destailleur
dcc4fa6a64
Merge branch 'develop' into patch-255 2019-10-08 19:37:42 +02:00
Laurent Destailleur
43a70e5548 Clean code to use the new $extrafields->attributes array 2019-10-08 09:28:50 +02:00
Laurent Destailleur
866dcf18fe Look and feel v11 2019-10-06 15:34:22 +02:00
Laurent Destailleur
2b66282b61 NEW Code for extrafields uses the new array $extrafields->attributes 2019-10-06 14:41:52 +02:00
Laurent Destailleur
b883a8092a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/lib/product.lib.php
	htdocs/core/tpl/extrafields_list_search_input.tpl.php
	htdocs/fourn/facture/card.php
	htdocs/product/class/html.formproduct.class.php
2019-10-05 19:35:40 +02:00
Laurent Destailleur
0b9d27423d FIX Can't modify vendor invoice if transfered into accountancy 2019-10-04 10:31:57 +02:00
Laurent Destailleur
6cd3d27885 Fix comparison 2019-10-04 09:54:52 +02:00
Laurent Destailleur
1a66e0b05e Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/product/card.php
2019-10-03 17:53:59 +02:00
Laurent Destailleur
24570f7165 Look and feel v11. Picto are fontawesome. 2019-10-02 18:14:41 +02:00