Commit Graph

95320 Commits

Author SHA1 Message Date
Laurent Destailleur
0315fb5fc3 Fix missing in v13 2021-02-26 19:19:48 +01:00
Laurent Destailleur
c4e98486f7 Trans 2021-02-26 15:15:55 +01:00
Laurent Destailleur
b95fd1697f
Merge pull request #16434 from altairisfr/serials_pr
differentiate serial numbers from lot management
2021-02-26 15:06:35 +01:00
Laurent Destailleur
5d0a0fe341 Clean code 2021-02-26 14:53:16 +01:00
Laurent Destailleur
92e65291e6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-26 14:33:53 +01:00
Laurent Destailleur
93f0754be9 Fix removed a bugged section (not used, was in develop mode only) 2021-02-26 14:33:27 +01:00
Laurent Destailleur
2f649d6582
Merge pull request #16459 from frederic34/theme_code_syntax
code syntax theme directory
2021-02-26 13:52:42 +01:00
Laurent Destailleur
2604426499
Merge pull request #16458 from frederic34/ticket_code_syntax
code syntax ticket directory
2021-02-26 13:52:33 +01:00
Laurent Destailleur
29467e983a Code comment 2021-02-26 13:50:54 +01:00
Frédéric FRANCE
920dabaab7
code syntax theme directory 2021-02-26 13:31:09 +01:00
Frédéric FRANCE
4c1004ea5d
code syntax ticket directory 2021-02-26 13:27:00 +01:00
Laurent Destailleur
6e49a0afa3
Merge pull request #16457 from frederic34/user_code_syntax
code syntax user directory
2021-02-26 13:25:16 +01:00
Laurent Destailleur
8aefb1b641
Merge pull request #16426 from josemariagomezroncero/patch-9
NEW Set status of all variant when setting status of parent
2021-02-26 13:25:04 +01:00
Laurent Destailleur
afcc3cb3e6
Update ProductCombination.class.php 2021-02-26 13:24:30 +01:00
Laurent Destailleur
77356afd03 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-26 13:22:28 +01:00
Laurent Destailleur
9e202467e0 Code comment 2021-02-26 13:22:13 +01:00
Laurent Destailleur
a9aa4b439a
Merge pull request #16456 from frederic34/variants_code_syntax
code syntax variants webservice directory
2021-02-26 13:19:48 +01:00
Laurent Destailleur
e43314e81c
Merge pull request #16453 from frederic34/zapier_code_syntax
code syntax zapier directory
2021-02-26 13:19:38 +01:00
Frédéric FRANCE
b970f4eca6
code syntax user directory 2021-02-26 13:18:40 +01:00
Laurent Destailleur
0c23deb2e6
Merge pull request #16421 from dvdwalker/develop
Minor Typo on tooltip class prenventing correct format to show
2021-02-26 13:17:26 +01:00
Laurent Destailleur
618d40d1a5
Merge branch 'develop' into develop 2021-02-26 13:17:12 +01:00
Laurent Destailleur
9fb15bde99
Merge pull request #16429 from bafbes/abb120369
Add region code and id into fetch of thirdparty
2021-02-26 13:16:00 +01:00
Laurent Destailleur
a296b86ee1
Update societe.class.php 2021-02-26 13:15:02 +01:00
stickler-ci
2cbdbf4f60 Fixing style errors. 2021-02-26 12:12:30 +00:00
Frédéric FRANCE
9fb263bcd7
Merge remote-tracking branch 'upstream/develop' into zapier_code_syntax 2021-02-26 13:11:57 +01:00
Frédéric FRANCE
db871994fb
code syntax variants webservice directory 2021-02-26 13:10:10 +01:00
Laurent Destailleur
ad63ac6bb0
Update societe.class.php 2021-02-26 13:08:24 +01:00
Laurent Destailleur
0d7a2c1d81
Merge pull request #16406 from frederic34/bom_codesyntax
code syntax bom directory
2021-02-26 13:05:45 +01:00
Laurent Destailleur
1c371d6bfa
Merge pull request #16414 from frederic34/contract_code_syntax
code syntax contrat directory
2021-02-26 13:05:36 +01:00
Laurent Destailleur
44d4fb6517
Merge pull request #16407 from frederic34/casdesk_code_syntax
code syntax cashdesk directory
2021-02-26 13:05:27 +01:00
Laurent Destailleur
aaf1863486
Merge pull request #16405 from frederic34/api_codesyntax
code syntax api directory
2021-02-26 13:05:18 +01:00
Laurent Destailleur
9c6a6baec3
Merge pull request #16455 from frederic34/patch-3
really fix typo
2021-02-26 13:05:02 +01:00
Laurent Destailleur
3705e45dfa
Merge pull request #16399 from frederic34/count_project_head
add cache on project head
2021-02-26 13:04:39 +01:00
Laurent Destailleur
a5925cc2cb
Merge branch 'develop' into count_project_head 2021-02-26 13:02:54 +01:00
Frédéric FRANCE
cb1e36de9c
really fix typo 2021-02-26 12:58:41 +01:00
Laurent Destailleur
09bc6bd552
Merge pull request #16422 from inovea-conseil/takepos_priceht
NEW option for Takepos
2021-02-26 12:57:39 +01:00
Laurent Destailleur
5ac6fa1ed6
Merge pull request #16400 from frederic34/patch-2
fix typo
2021-02-26 12:56:30 +01:00
Laurent Destailleur
66fba16448
Merge pull request #16424 from frederic34/patch-4
typo
2021-02-26 12:56:09 +01:00
Laurent Destailleur
97ddc6890e
Merge pull request #16454 from frederic34/website_code_syntax
code syntax website directory
2021-02-26 12:55:49 +01:00
Laurent Destailleur
886965be76 Show product on lot record tab document 2021-02-26 12:54:57 +01:00
Laurent Destailleur
f5406d487b Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/core/class/html.formmail.class.php
	htdocs/core/lib/product.lib.php
	htdocs/product/stock/productlot_card.php
	test/phpunit/SecurityTest.php
2021-02-26 12:53:06 +01:00
Laurent Destailleur
9ebf5c2be1 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-02-26 12:48:08 +01:00
Laurent Destailleur
16906abc09 FIX File attachment on lots 2021-02-26 12:47:57 +01:00
Laurent Destailleur
00d2d28d68 NEW: Can create a lot from list
Make code like modulebuilder
2021-02-26 12:34:41 +01:00
Frédéric FRANCE
256001ebd6
code syntax website directory 2021-02-26 12:03:07 +01:00
Frédéric FRANCE
7d97d16eeb
code syntax zapier directory 2021-02-26 11:59:13 +01:00
Juanjo Menent
badd46e289 FIX: Bad project filter in ticket list 2021-02-26 11:53:23 +01:00
Christophe Battarel
4aaf9e133a change translation 2021-02-26 11:51:23 +01:00
Laurent Destailleur
34ed5519fd
Merge pull request #16435 from altairisfr/batchevents_pr
add event management to batch products
2021-02-26 11:50:48 +01:00
Laurent Destailleur
60016cc3f3 Fix phpcs 2021-02-26 11:29:16 +01:00